diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 00000000000..326dd3e0b29
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,28 @@
+# DSpace configuration for Codecov.io coverage reports
+# These override the default YAML settings at
+# https://docs.codecov.io/docs/codecov-yaml#section-default-yaml
+# Can be validated via instructions at:
+# https://docs.codecov.io/docs/codecov-yaml#validate-your-repository-yaml
+
+# Settings related to code coverage analysis
+coverage:
+  status:
+    # Configuration for project-level checks. This checks how the PR changes overall coverage.
+    project:
+      default:
+        # For each PR, auto compare coverage to previous commit.
+        # Require that overall (project) coverage does NOT drop more than 0.5%
+        target: auto
+        threshold: 0.5%
+    # Configuration for patch-level checks. This checks the relative coverage of the new PR code ONLY.
+    patch:
+      default:
+         # Enable informational mode, which just provides info to reviewers & always passes
+         # https://docs.codecov.io/docs/commit-status#section-informational
+         informational: true
+
+# Turn PR comments "off". This feature adds the code coverage summary as a
+# comment on each PR. See https://docs.codecov.io/docs/pull-request-comments
+# However, this same info is available from the Codecov checks in the PR's
+# "Checks" tab in GitHub. So, the comment is unnecessary.
+comment: false
diff --git a/.editorconfig b/.editorconfig
index 70ce43b68ed..15d4c87b142 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,6 @@ trim_trailing_whitespace = true
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
+
+[*.ts]
+quote_type = single
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000000..8e4ed0811d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, needs triage
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Include the version(s) of DSpace where you've seen this problem & what *web browser* you were using. Link to examples if they are public.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Do this
+2. Then this...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Related work**
+Link to any related tickets or PRs here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000000..34cc2c9e4f3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest a new feature for this project
+title: ''
+labels: new feature, needs triage
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives or workarounds you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/disabled-workflows/pull_request_opened.yml b/.github/disabled-workflows/pull_request_opened.yml
new file mode 100644
index 00000000000..0dc718c0b9a
--- /dev/null
+++ b/.github/disabled-workflows/pull_request_opened.yml
@@ -0,0 +1,26 @@
+# This workflow runs whenever a new pull request is created
+# TEMPORARILY DISABLED. Unfortunately this doesn't work for PRs created from forked repositories (which is how we tend to create PRs).
+# There is no known workaround yet. See https://github.community/t/how-to-use-github-token-for-prs-from-forks/16818
+name: Pull Request opened
+
+# Only run for newly opened PRs against the "main" branch
+on: 
+  pull_request:
+    types: [opened]
+    branches: 
+      - main
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    steps:
+    # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
+    # See https://github.com/marketplace/actions/pull-request-assigner
+    - name: Assign PR to creator
+      uses: thomaseizinger/assign-pr-creator-action@v1.0.0
+      # Note, this authentication token is created automatically
+      # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+      # Ignore errors. It is possible the PR was created by someone who cannot be assigned
+      continue-on-error: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 682f67294b8..be15b0a507c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 ## References
-_Add references/links to any related tickets or PRs. These may include:_
-* Link to [Angular issue or PR](https://github.com/DSpace/dspace-angular/issues) related to this PR, if any
-* Link to [JIRA](https://jira.lyrasis.org/projects/DS/summary) ticket(s), if any
+_Add references/links to any related issues or PRs. These may include:_
+* Fixes #[issue-number]
+* Requires DSpace/DSpace#[pr-number] (if a REST API PR is required to test this)
 
 ## Description
 Short summary of changes (1-2 sentences).
@@ -20,9 +20,7 @@ _This checklist provides a reminder of what we are going to look for when review
 
 - [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
 - [ ] My PR passes [TSLint](https://palantir.github.io/tslint/) validation using `yarn run lint`
+- [ ] My PR doesn't introduce circular dependencies
 - [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
-- [ ] My PR passes all specs/tests and includes new/updated specs for any bug fixes, improvements or new features. A few reminders about what constitutes good tests:
-    * Include tests for different user types (if behavior differs), including: (1) Anonymous user, (2) Logged in user (non-admin), and (3) Administrator.
-    * Include tests for error scenarios, e.g. when errors/warnings should appear (or buttons should be disabled).
-    * For bug fixes, include a test that reproduces the bug and proves it is fixed. For clarity, it may be useful to provide the test in a separate commit from the bug fix.
-- [ ] If my PR includes new, third-party dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/master/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] My PR passes all specs/tests and includes new/updated specs or 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 `package.json`), 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.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000000..0495f51fc2c
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,87 @@
+# DSpace Continuous Integration/Build via GitHub Actions
+# Concepts borrowed from
+# https://docs.github.com/en/free-pro-team@latest/actions/guides/building-and-testing-nodejs
+name: Build
+
+# Run this Build for all pushes / PRs to current branch
+on: [push, pull_request]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    env:
+      # The ci step will test the dspace-angular code against DSpace REST.
+      # Direct that step to utilize a DSpace REST service that has been started in docker.
+      DSPACE_REST_HOST: localhost
+      DSPACE_REST_PORT: 8080
+      DSPACE_REST_NAMESPACE: '/server'
+      DSPACE_REST_SSL: false
+    strategy:
+      # Create a matrix of Node versions to test against (in parallel)
+      matrix:
+        node-version: [10.x, 12.x]
+      # Do NOT exit immediately if one matrix job fails
+      fail-fast: false
+    # These are the actual CI steps to perform per job
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v1
+
+      # https://github.com/actions/setup-node
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install latest Chrome (for e2e tests)
+        run: |
+          sudo apt-get update
+          sudo apt-get --only-upgrade install google-chrome-stable -y
+          google-chrome --version
+
+      # https://github.com/actions/cache/blob/main/examples.md#node---yarn
+      - name: Get Yarn cache directory
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache Yarn dependencies
+        uses: actions/cache@v2
+        with:
+          # Cache entire Yarn cache directory (see previous step)
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          # Cache key is hash of yarn.lock. Therefore changes to yarn.lock will invalidate cache
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: ${{ runner.os }}-yarn-
+
+      - name: Install Yarn dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Run lint
+        run: yarn run lint
+
+      - name: Run build
+        run: yarn run build:prod
+
+      - name: Run specs (unit tests)
+        run: yarn run test:headless
+
+      # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
+      # Upload coverage reports to Codecov (for Node v12 only)
+      # https://github.com/codecov/codecov-action
+      - name: Upload coverage to Codecov.io
+        uses: codecov/codecov-action@v1
+        if: matrix.node-version == '12.x'
+
+      # Using docker-compose start backend using CI configuration
+      # and load assetstore from a cached copy
+      - name: Start DSpace REST Backend via Docker (for e2e tests)
+        run: |
+          docker-compose -f ./docker/docker-compose-ci.yml up -d
+          docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
+          docker container ls
+
+      - name: Run e2e tests (integration tests)
+        run: yarn run e2e:ci
+
+      - name: Shutdown Docker containers
+        run: docker-compose -f ./docker/docker-compose-ci.yml down
diff --git a/.github/workflows/issue_opened.yml b/.github/workflows/issue_opened.yml
new file mode 100644
index 00000000000..6b9a273ab6d
--- /dev/null
+++ b/.github/workflows/issue_opened.yml
@@ -0,0 +1,29 @@
+# This workflow runs whenever a new issue is created
+name: Issue opened
+
+on: 
+  issues:
+    types: [opened]
+
+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
+      # 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
+      # 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
+      # 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
diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
new file mode 100644
index 00000000000..dcbab18f1b5
--- /dev/null
+++ b/.github/workflows/label_merge_conflicts.yml
@@ -0,0 +1,25 @@
+# This workflow checks open PRs for merge conflicts and labels them when conflicts are found
+name: Check for merge conflicts
+
+# Run whenever the "main" branch is updated
+# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      # See: https://github.com/mschilde/auto-label-merge-conflicts/
+      - name: Auto-label PRs with merge conflicts
+        uses: mschilde/auto-label-merge-conflicts@v2.0
+        # 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
diff --git a/.gitignore b/.gitignore
index 6950bea78de..f110ba720c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ package-lock.json
 .java-version
 
 .env
+/nbproject/
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0d65d76f41a..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-sudo: required
-dist: bionic
-language: node_js
-
-# Enable caching for yarn & node_modules
-cache:
-  yarn: true
-
-node_js:
-  - "10"
-  - "12"
-
-# Install latest chrome (for e2e headless testing). Run an update if needed.
-addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
-    update: true
-
-env:
-  # The ci step will test the dspace-angular code against DSpace REST.
-  # Direct that step to utilize a DSpace REST service that has been started in docker.
-  DSPACE_REST_HOST: localhost
-  DSPACE_REST_PORT: 8080
-  DSPACE_REST_NAMESPACE: '/server/api'
-  DSPACE_REST_SSL: false
-
-before_install:
-  # Check our versions of everything
-  - echo "Check versions"
-  - yarn -v
-  - docker-compose -v
-  - google-chrome-stable --version
-
-install:
-  # Start up DSpace 7 using the entities database dump
-  - docker-compose -f ./docker/docker-compose-travis.yml up -d
-  # Use the dspace-cli image to populate the assetstore. Triggers a discovery and oai update
-  - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
-  - travis_retry yarn install
-
-before_script:
-  - echo "Check Docker containers"
-  - docker container ls
-  # The following line could be enabled to verify that the rest server is responding.
-  #- echo "Check REST API available (via Docker)"
-  #- curl http://localhost:8080/server/
-
-script:
-  - yarn run ci
-  - cat coverage/dspace-angular-cli/lcov.info | ./node_modules/coveralls/bin/coveralls.js
-
-after_script:
-  # Shutdown docker after everything runs
-  - docker-compose -f ./docker/docker-compose-travis.yml down
diff --git a/README.md b/README.md
index 78d7816f659..4b4c7dc6cfb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/DSpace/dspace-angular.svg?branch=master)](https://travis-ci.org/DSpace/dspace-angular) [![Coverage Status](https://coveralls.io/repos/github/DSpace/dspace-angular/badge.svg?branch=master)](https://coveralls.io/github/DSpace/dspace-angular?branch=master) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal)
+[![Build Status](https://github.com/DSpace/dspace-angular/workflows/Build/badge.svg?branch=main)](https://github.com/DSpace/dspace-angular/actions?query=workflow%3ABuild) [![Coverage Status](https://codecov.io/gh/DSpace/dspace-angular/branch/main/graph/badge.svg)](https://codecov.io/gh/DSpace/dspace-angular) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal)
 
 dspace-angular
 ==============
@@ -104,11 +104,12 @@ DSPACE_REST_SSL # Whether the angular REST uses SSL [true/false]
 
 The same settings can also be overwritten by setting system environment variables instead, E.g.:
 ```bash 
-export DSPACE_HOST=https://dspace7.4science.cloud/server
+export DSPACE_HOST=dspace7.4science.cloud
 ```
 
 The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides **`environment.(prod, dev or test).ts`** overrides **`environment.common.ts`**
 
+These configuration sources are collected **at build time**, and written to `src/environments/environment.ts`.  At runtime the configuration is fixed, and neither `.env` nor the process' environment will be consulted.
 
 #### Using environment variables in code
 To use environment variables in a UI component, use:
@@ -134,14 +135,14 @@ To build the app for production and start the server run:
 ```bash
 yarn start
 ```
+This will run the application in an instance of the Express server, which is included.
 
 If you only want to build for production, without starting, run:
 
 ```bash
 yarn run build:prod
 ```
-
-This will build the application and put the result in the `dist` folder
+This will build the application and put the result in the `dist` folder.  You can copy this folder to wherever you need it for your application server.  If you will be using the built-in Express server, you'll also need a copy of the `node_modules` folder tucked inside your copy of `dist`.
 
 
 ### Running the application with Docker
diff --git a/angular.json b/angular.json
index b3fbd82f022..fcb2d968f01 100644
--- a/angular.json
+++ b/angular.json
@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "dspace-angular-cli": {
+    "dspace-angular": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -18,7 +18,7 @@
           "builder": "@angular-builders/custom-webpack:browser",
           "options": {
             "customWebpackConfig": {
-              "path": "./webpack/webpack.common.ts",
+              "path": "./webpack/webpack.browser.ts",
               "mergeStrategies": {
                 "loaders": "prepend"
               }
@@ -30,7 +30,8 @@
             "tsConfig": "tsconfig.app.json",
             "aot": false,
             "assets": [
-              "src/assets"
+              "src/assets",
+              "src/robots.txt"
             ],
             "styles": [
               "src/styles.scss"
@@ -65,26 +66,26 @@
         "serve": {
           "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
-            "browserTarget": "dspace-angular-cli:build",
+            "browserTarget": "dspace-angular:build",
             "port": 4000
           },
           "configurations": {
             "production": {
-              "browserTarget": "dspace-angular-cli:build:production"
+              "browserTarget": "dspace-angular:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "dspace-angular-cli:build"
+            "browserTarget": "dspace-angular:build"
           }
         },
         "test": {
           "builder": "@angular-builders/custom-webpack:karma",
           "options": {
             "customWebpackConfig": {
-              "path": "./webpack/webpack.common.ts",
+              "path": "./webpack/webpack.test.ts",
               "mergeStrategies": {
                 "loaders": "prepend"
               }
@@ -93,6 +94,12 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
+            "sourceMap": {
+              "scripts": false,
+              "styles": false,
+              "hidden": false,
+              "vendor": false
+            },
             "assets": [
               "src/assets"
             ],
@@ -119,11 +126,11 @@
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "dspace-angular-cli:serve"
+            "devServerTarget": "dspace-angular:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "dspace-angular-cli:serve:production"
+              "devServerTarget": "dspace-angular:serve:production"
             }
           }
         },
@@ -153,5 +160,5 @@
       }
     }
   },
-  "defaultProject": "dspace-angular-cli"
+  "defaultProject": "dspace-angular"
 }
diff --git a/docker/README.md b/docker/README.md
index f7b4b048482..809a150d866 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,13 +5,13 @@
   - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace 7 REST instance will also be started in Docker.
 - docker-compose-rest.yml
   - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
-- docker-compose-travis.yml
+- docker-compose-ci.yml
   - Runs a published instance of the DSpace 7 REST API for CI testing.  The database is re-populated from a SQL dump on each startup.
 - cli.yml
   - Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container.
 - cli.assetstore.yml
   - Docker compose file that will download and install data into a DSpace REST assetstore.  This script points to a default dataset that will be utilized for CI testing.
-- environment.dev.js
+- environment.dev.ts
   - Environment file for running DSpace Angular in Docker
 - local.cfg
   - Environment file for running the DSpace 7 REST API in Docker.
diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 075c494a6cf..592194a7528 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -1,3 +1,17 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+#
+# This is a copy of the cli.ingest.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.assetstore.yml
+#
+# Therefore, it should be kept in sync with that file
 version: "3.7"
 
 networks:
@@ -8,7 +22,7 @@ services:
     networks:
       dspacenet: {}
     environment:
-      - LOADASSETS=https://www.dropbox.com/s/zv7lj8j2lp3egjs/assetstore.tar.gz?dl=1
+      - LOADASSETS=https://www.dropbox.com/s/v3ahfcuatklbmi0/assetstore-2019-11-28.tar.gz?dl=1
     entrypoint:
       - /bin/bash
       - '-c'
@@ -21,3 +35,5 @@ services:
         fi
 
         /dspace/bin/dspace index-discovery
+        /dspace/bin/dspace oai import
+        /dspace/bin/dspace oai clean-cache
diff --git a/docker/cli.ingest.yml b/docker/cli.ingest.yml
index f5ec7eb90d4..1db241af3bf 100644
--- a/docker/cli.ingest.yml
+++ b/docker/cli.ingest.yml
@@ -6,12 +6,18 @@
 # http://www.dspace.org/license/
 #
 
+#
+# This is a copy of the cli.ingest.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.ingest.yml
+#
+# Therefore, it should be kept in sync with that file
 version: "3.7"
 
 services:
   dspace-cli:
     environment:
-    - AIPZIP=https://github.com/DSpace-Labs/AIP-Files/raw/master/dogAndReport.zip
+    - AIPZIP=https://github.com/DSpace-Labs/AIP-Files/raw/main/dogAndReport.zip
     - ADMIN_EMAIL=test@test.edu
     - AIPDIR=/tmp/aip-dir
     entrypoint:
diff --git a/docker/cli.yml b/docker/cli.yml
index ea5e3e05951..36f63b2cff2 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -1,3 +1,17 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+#
+# This is a copy of the docker-compose-cli.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/docker-compose-cli.yml
+#
+# Therefore, it should be kept in sync with that file
 version: "3.7"
 
 services:
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index 91d96bd72b4..d39eedc5c68 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -6,11 +6,17 @@
 # http://www.dspace.org/license/
 #
 
+#
+# This is a copy of the db.entities.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
+#
+# # Therefore, it should be kept in sync with that file
 version: "3.7"
 
 services:
   dspacedb:
     image: dspace/dspace-postgres-pgcrypto:loadsql
     environment:
-      # Double underbars in env names will be replaced with periods for apache commons
-      - LOADSQL=https://www.dropbox.com/s/xh3ack0vg0922p2/configurable-entities-2019-05-08.sql?dl=1
+      # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
+      - LOADSQL=https://www.dropbox.com/s/4ap1y6deseoc8ws/dspace7-entities-2019-11-28.sql?dl=1
diff --git a/docker/docker-compose-travis.yml b/docker/docker-compose-ci.yml
similarity index 64%
rename from docker/docker-compose-travis.yml
rename to docker/docker-compose-ci.yml
index f0f5ef70e8d..ec2d0912cfa 100644
--- a/docker/docker-compose-travis.yml
+++ b/docker/docker-compose-ci.yml
@@ -1,3 +1,13 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+# Docker Compose for running the DSpace backend for e2e testing in a CI environment
+# This is used by our GitHub CI at .github/workflows/build.yml
 networks:
   dspacenet:
 services:
@@ -19,7 +29,9 @@ services:
   dspacedb:
     container_name: dspacedb
     environment:
-      LOADSQL: https://www.dropbox.com/s/xh3ack0vg0922p2/configurable-entities-2019-05-08.sql?dl=1
+      # This LOADSQL should be kept in sync with the LOADSQL in
+      # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
+      LOADSQL: https://www.dropbox.com/s/4ap1y6deseoc8ws/dspace7-entities-2019-11-28.sql?dl=1
       PGDATA: /pgdata
     image: dspace/dspace-postgres-pgcrypto:loadsql
     networks:
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 6f5a1d6c83c..e6668f3f58d 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -1,11 +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/
+#
+
+# Docker Compose for running the DSpace backend for testing/development
+# This is based heavily on the docker-compose.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/docker-compose.yml
+version: '3.7'
 networks:
   dspacenet:
 services:
   dspace:
     container_name: dspace
+    image: dspace/dspace:dspace-7_x-test
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
     networks:
       dspacenet:
     ports:
@@ -16,20 +29,27 @@ services:
     volumes:
     - assetstore:/dspace/assetstore
     - "./local.cfg:/dspace/config/local.cfg"
-    # Ensure that the database is ready before starting tomcat
+    # Ensure that the database is ready BEFORE starting tomcat
+    # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
+    # 2. Then, run database migration to init database tables
+    # 3. Finally, start Tomcat
     entrypoint:
     - /bin/bash
     - '-c'
     - |
+      while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
       /dspace/bin/dspace database migrate
       catalina.sh run
   dspacedb:
     container_name: dspacedb
-    image: dspace/dspace-postgres-pgcrypto
     environment:
       PGDATA: /pgdata
+    image: dspace/dspace-postgres-pgcrypto
     networks:
       dspacenet:
+    ports:
+    - published: 5432
+      target: 5432
     stdin_open: true
     tty: true
     volumes:
@@ -49,7 +69,6 @@ services:
     - solr_oai:/opt/solr/server/solr/oai/data
     - solr_search:/opt/solr/server/solr/search/data
     - solr_statistics:/opt/solr/server/solr/statistics/data
-version: '3.7'
 volumes:
   assetstore:
   pgdata:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 05376cfb360..7c5c3269590 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,3 +1,14 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+# Docker Compose for running the DSpace Angular UI for testing/development
+# Requires also running a REST API backend (either locally or remotely),
+# for example via 'docker-compose-rest.yml'
 version: '3.7'
 networks:
   dspacenet:
@@ -23,4 +34,4 @@ services:
     stdin_open: true
     tty: true
     volumes:
-    - ./environment.dev.js:/app/src/environments/environment.dev.ts
+    - ./environment.dev.ts:/app/src/environments/environment.dev.ts
diff --git a/docker/environment.dev.ts b/docker/environment.dev.ts
index e8c88112fa9..0e603ef11d4 100644
--- a/docker/environment.dev.ts
+++ b/docker/environment.dev.ts
@@ -1,18 +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/
  */
-import { GlobalConfig } from '../src/config/global-config.interface';
-
-export const environment: Partial<GlobalConfig> = {
+// This file is based on environment.template.ts provided by Angular UI
+export const environment = {
+  // Default to using the local REST API (running in Docker)
   rest: {
     ssl: false,
     host: 'localhost',
     port: 8080,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api'
+    nameSpace: '/server'
   }
 };
diff --git a/docker/local.cfg b/docker/local.cfg
index 70bc45c112c..a511c25789d 100644
--- a/docker/local.cfg
+++ b/docker/local.cfg
@@ -1,5 +1,6 @@
 dspace.dir=/dspace
 db.url=jdbc:postgresql://dspacedb:5432/dspace
 dspace.server.url=http://localhost:8080/server
+dspace.ui.url=http://localhost:4000
 dspace.name=DSpace Started with Docker Compose
 solr.server=http://dspacesolr:8983/solr
diff --git a/docs/Configuration.md b/docs/Configuration.md
index f523a9a1a10..ac5ca3ef722 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -1,9 +1,9 @@
 # Configuration
 
-Default configuration file is located in `config/` folder. All configuration options should be listed in the default configuration file `config/environment.default.js`. Please do not change this file directly! To change the default configuration values, create local files that override the parameters you need to change:
+Default configuration file is located in `src/environments/` folder. All configuration options should be listed in the default configuration file `src/environments/environment.common.ts`. Please do not change this file directly! To change the default configuration values, create local files that override the parameters you need to change. You can use `environment.template.ts` as a starting point.
 
--	Create a new `environment.dev.js` file in `config/` for `devel` environment;
--	Create a new `environment.prod.js` file in `config/` for `production` environment;
+-	Create a new `environment.dev.ts` file in `src/environments/` for `development` environment;
+-	Create a new `environment.prod.ts` file in `src/environments/` for `production` environment;
 
 Some few configuration options can be overridden by setting environment variables. These and the variable names are listed below.
 
@@ -12,8 +12,8 @@ When you start dspace-angular on node, it spins up an http server on which it li
 
 To change this configuration, change the options `ui.host`, `ui.port` and `ui.ssl` in the appropriate configuration file (see above):
 ```
-module.exports = {
-  // Angular Universal server settings.
+export const environment = {
+  // Angular UI settings.
   ui: {
     ssl: false,
     host: 'localhost',
@@ -35,14 +35,14 @@ Alternately you can set the following environment variables. If any of these are
 dspace-angular connects to your DSpace installation by using its REST endpoint. To do so, you have to define the ip address, port and if ssl should be enabled. You can do this in a configuration file (see above) by adding the following options:
 
 ```
-module.exports = {
+export const environment = {
   // The REST API server settings.
   rest: {
     ssl: true,
-    host: 'dspace7.4science.it',
+    host: 'dspace7.4science.cloud',
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/dspace-spring-rest/api'
+    nameSpace: '/server'
   }
 };
 ```
@@ -50,9 +50,9 @@ module.exports = {
 Alternately you can set the following environment variables. If any of these are set, it will override all configuration files:
 ```
   DSPACE_REST_SSL=true
-  DSPACE_REST_HOST=localhost
-  DSPACE_REST_PORT=4000
-  DSPACE_REST_NAMESPACE=/
+  DSPACE_REST_HOST=dspace7.4science.cloud
+  DSPACE_REST_PORT=443
+  DSPACE_REST_NAMESPACE=/server
 ```
 
 ## Supporting analytics services other than Google Analytics
@@ -63,3 +63,70 @@ Angulartics can be configured to work with a number of other services besides Go
 In order to start using one of these services, select it from the [Angulartics Providers page](https://angulartics.github.io/angulartics2/#providers), and follow the instructions on how to configure it.
 
 The Google Analytics script was added in [`main.browser.ts`](https://github.com/DSpace/dspace-angular/blob/ff04760f4af91ac3e7add5e7424a46cb2439e874/src/main.browser.ts#L33) instead of the `<head>` tag in `index.html` to ensure events get sent when the page is shown in a client's browser, and not when it's rendered on the universal server. Likely you'll want to do the same when adding a new service.
+
+## SEO when hosting REST Api and UI on different servers
+
+Indexers such as Google Scholar require that files are hosted on the same domain as the page that links them. In DSpace 7, Bitstreams are served from the REST server. So if you use different servers for the REST api and the UI you'll want to ensure that Bitstream downloads are proxied through the UI server. 
+
+In order to achieve this we'll need to do two things:
+- **Proxy the Bitstream downloads through the UI server.** You'll need to put a webserver such as httpd or nginx in front of the UI server in order to achieve this. [Below](#apache-http-server-config) you'll find a section explaining how to do it in httpd.
+- **Update the URLs for Bitstream downloads to match the UI server.** This can be done using a setting in the UI environment file. 
+
+### UI config
+If you set the property `rewriteDownloadUrls` to `true` in your `environment.prod.ts` file, the [origin](https://developer.mozilla.org/en-US/docs/Glossary/Origin) of any download URL will be replaced by the origin of the UI. This will also happen for the `citation_pdf_url` `<meta>` tag on Item pages.
+
+The app will determine the UI origin currently in use, so the external UI URL doesn't need to be configured anywhere and rewrites will still work if you host the UI from multiple domains.
+
+### Apache HTTP Server config
+
+#### Basics
+In order to be able to host bitstreams from the UI Server you'll need to enable mod_proxy and add the following to the httpd config of your UI server:
+
+```
+ProxyPassMatch    "/server/api/core/bitstreams/([^/]+)/content" "http://rest.api/server/api/core/bitstreams/$1/content" 
+ProxyPassReverse  "/server/api/core/bitstreams/([^/]+)/content" "http://rest.api/server/api/core/bitstreams/$1/content"
+```
+
+Replace http://rest.api in with the correct origin for your REST server.
+
+The `ProxyPassMatch` line forwards all requests matching the regular expression for a bitstream download URL to the corresponding path on the REST server
+
+The `ProxyPassReverse` ensures that if the REST server were to return redirect response, httpd would also swap out its hostname for the hostname of the UI before forwarding the response to the client.
+
+#### Using HTTPS
+If your REST server uses https, you'll need to enable mod_ssl and ensure `SSLProxyEngine on` is part of your UI server's httpd config as well
+
+If the UI hostname doesn't match the CN in the SSL certificate of the REST server (which is likely if they're on different domains), you'll also need to add the following lines
+
+```
+SSLProxyCheckPeerCN off
+SSLProxyCheckPeerName off
+```
+These are two names for [the same directive](https://httpd.apache.org/docs/trunk/mod/mod_ssl.html#sslproxycheckpeername) that have been used for various versions of httpd, old versions need the former, then some in-between versions need both, and newer versions only need the latter. Keeping them both doesn't harm anything.
+
+So the entire config becomes:
+
+```
+SSLProxyEngine on
+SSLProxyCheckPeerCN off
+SSLProxyCheckPeerName off
+ProxyPassMatch    "/server/api/core/bitstreams/([^/]+)/content" "https://rest.api/server/api/core/bitstreams/$1/content" 
+ProxyPassReverse  "/server/api/core/bitstreams/([^/]+)/content" "https://rest.api/server/api/core/bitstreams/$1/content"
+```
+
+If you don't want httpd to verify the certificate of the REST server, you can also turn all checks off with the following config:
+
+```
+SSLProxyEngine on
+SSLProxyVerify none
+SSLProxyCheckPeerCN off
+SSLProxyCheckPeerName off
+SSLProxyCheckPeerExpire off
+ProxyPassMatch    "/server/api/core/bitstreams/([^/]+)/content" "https://rest.api/server/api/core/bitstreams/$1/content" 
+ProxyPassReverse  "/server/api/core/bitstreams/([^/]+)/content" "https://rest.api/server/api/core/bitstreams/$1/content"
+```
+
+
+
+
+
diff --git a/karma.conf.js b/karma.conf.js
index 9844d659044..a3b6803e6d4 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -17,7 +17,7 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, './coverage/dspace-angular-cli'),
+      dir: require('path').join(__dirname, './coverage/dspace-angular'),
       reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
diff --git a/package.json b/package.json
index 4c6bd31cacf..60473fbffc2 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "dspace-angular-cli",
+  "name": "dspace-angular",
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
@@ -17,13 +17,13 @@
     "pree2e": "yarn run config:prod",
     "pree2e:ci": "yarn run config:prod",
     "start": "yarn run start:prod",
-    "serve": "ng serve",
+    "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
     "start:dev": "npm-run-all --parallel config:dev:watch serve",
     "start:prod": "yarn run build:prod && yarn run serve:ssr",
     "build": "ng build",
     "build:prod": "yarn run build:ssr",
     "build:ssr": "yarn run build:client-and-server-bundles && yarn run compile:server",
-    "build:client-and-server-bundles": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod && ng run dspace-angular-cli:server:production --bundleDependencies all",
+    "build:client-and-server-bundles": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod && ng run dspace-angular:server:production --bundleDependencies all",
     "test:watch": "npm-run-all --parallel config:test:watch test",
     "test": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng test --sourceMap=true --watch=true",
     "test:headless": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng test --watch=false --sourceMap=true --browsers=ChromeHeadless --code-coverage",
@@ -32,7 +32,6 @@
     "e2e:ci": "ng e2e --protractor-config=./e2e/protractor-ci.conf.js",
     "compile:server": "webpack --config webpack.server.config.js --progress --colors",
     "serve:ssr": "node dist/server",
-    "ci": "ng lint && yarn run build:prod && yarn test:headless && yarn run e2e:ci",
     "clean:coverage": "rimraf coverage",
     "clean:dist": "rimraf dist",
     "clean:doc": "rimraf doc",
@@ -41,7 +40,7 @@
     "clean:bld": "rimraf build",
     "clean:node": "rimraf node_modules",
     "clean:prod": "yarn run clean:coverage && yarn run clean:doc && yarn run clean:dist && yarn run clean:log && yarn run clean:json && yarn run clean:bld",
-    "clean": "yarn run clean:prod && yarn run clean:node && yarn run clean:env",
+    "clean": "yarn run clean:prod && yarn run clean:env && yarn run clean:node",
     "clean:env": "rimraf src/environments/environment.ts",
     "sync-i18n": "yarn run config:dev && ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts"
   },
@@ -52,6 +51,9 @@
     "https": false
   },
   "private": true,
+  "resolutions": {
+    "minimist": "^1.2.5"
+  },
   "dependencies": {
     "@angular/animations": "~8.2.14",
     "@angular/cdk": "8.2.3",
@@ -86,18 +88,21 @@
     "debug-loader": "^0.0.1",
     "deepmerge": "^4.2.2",
     "express": "4.16.2",
+    "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^2.0.7",
     "file-saver": "^1.3.8",
+    "filesize": "^6.1.0",
     "font-awesome": "4.7.0",
     "https": "1.0.0",
     "js-cookie": "2.2.0",
     "json5": "^2.1.0",
     "jsonschema": "1.2.2",
     "jwt-decode": "^2.2.0",
+    "klaro": "^0.6.3",
     "moment": "^2.22.1",
     "morgan": "^1.9.1",
     "ng-mocks": "^8.1.0",
-    "ng2-file-upload": "1.2.1",
+    "ng2-file-upload": "1.4.0",
     "ng2-nouislider": "^1.8.2",
     "ngx-bootstrap": "^5.3.2",
     "ngx-infinite-scroll": "6.0.1",
@@ -136,17 +141,17 @@
     "codelyzer": "^5.0.0",
     "compression-webpack-plugin": "^3.0.1",
     "copy-webpack-plugin": "^5.1.1",
-    "coveralls": "3.0.0",
     "css-loader": "3.4.0",
     "cssnano": "^4.1.10",
     "deep-freeze": "0.0.1",
     "dotenv": "^8.2.0",
     "fork-ts-checker-webpack-plugin": "^0.4.10",
     "html-webpack-plugin": "^3.2.0",
+    "http-proxy-middleware": "^1.0.5",
     "jasmine-core": "^3.3.0",
     "jasmine-marbles": "0.3.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
+    "karma": "^5.0.9",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "2.0.1",
@@ -157,10 +162,10 @@
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "postcss-apply": "0.11.0",
     "postcss-cssnext": "3.1.0",
+    "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-responsive-type": "1.0.0",
-    "postcss-smart-import": "^0.7.6",
-    "protractor": "~5.4.0",
+    "protractor": "^7.0.0",
     "protractor-istanbul-plugin": "2.0.0",
     "raw-loader": "0.5.1",
     "rimraf": "^3.0.2",
diff --git a/postcss.config.js b/postcss.config.js
index c499f9da90c..1c46e245eaa 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   plugins: [
-    require('postcss-smart-import')(),
+    require('postcss-import')(),
     require('postcss-cssnext')(),
     require('postcss-apply')(),
     require('postcss-responsive-type')()
diff --git a/scripts/serve.ts b/scripts/serve.ts
new file mode 100644
index 00000000000..c69f8e8a215
--- /dev/null
+++ b/scripts/serve.ts
@@ -0,0 +1,11 @@
+import { environment } from '../src/environments/environment';
+
+import * as child from 'child_process';
+
+/**
+ * Calls `ng serve` with the following arguments configured for the UI in the environment file: host, port, nameSpace, ssl
+ */
+child.spawn(
+  `ng serve --host ${environment.ui.host} --port ${environment.ui.port} --servePath ${environment.ui.nameSpace} --ssl ${environment.ui.ssl}`,
+  { stdio:'inherit', shell: true }
+);
diff --git a/server.ts b/server.ts
index 31cefe4ec5b..202d5a58bcb 100644
--- a/server.ts
+++ b/server.ts
@@ -15,28 +15,71 @@
  * import for `ngExpressEngine`.
  */
 
-import 'zone.js/dist/zone-node';
 import 'reflect-metadata';
+import 'rxjs';
 
+import * as fs from 'fs';
+import * as pem from 'pem';
+import * as https from 'https';
+import * as morgan from 'morgan';
 import * as express from 'express';
-import { join } from 'path';
-import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 import * as bodyParser from 'body-parser';
+import * as compression from 'compression';
 import * as cookieParser from 'cookie-parser';
-import { environment } from './src/environments/environment';
+import { join } from 'path';
 
-// Express server
-const app = express();
+import { enableProdMode } from '@angular/core';
+
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
+import { environment } from './src/environments/environment';
+import { createProxyMiddleware } from 'http-proxy-middleware';
+import { hasNoValue, hasValue } from './src/app/shared/empty.util';
+import { UIServerConfig } from './src/config/ui-server-config.interface';
 
-const PORT = environment.ui.port || 4000;
+/*
+ * Set path for the browser application's dist folder
+ */
 const DIST_FOLDER = join(process.cwd(), 'dist/browser');
 
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
 const { ServerAppModuleNgFactory, LAZY_MODULE_MAP, ngExpressEngine, provideModuleMap } = require('./dist/server/main');
 
+/*
+ * Create a new express application
+ */
+const app = express();
+
+/*
+ * If production mode is enabled in the environment file:
+ * - Enable Angular's production mode
+ * - Enable compression for response bodies. See [compression](https://github.com/expressjs/compression)
+ */
+if (environment.production) {
+  enableProdMode();
+  app.use(compression());
+}
+
+/*
+ * Enable request logging
+ * See [morgan](https://github.com/expressjs/morgan)
+ */
+app.use(morgan('dev'));
+
+/*
+ * Add cookie parser middleware
+ * See [morgan](https://github.com/expressjs/cookie-parser)
+ */
 app.use(cookieParser());
+
+/*
+ * Add parser for request bodies
+ * See [morgan](https://github.com/expressjs/body-parser)
+ */
 app.use(bodyParser.json());
 
+/*
+ * Render html pages by running angular server side
+ */
 app.engine('html', (_, options, callback) =>
   ngExpressEngine({
     bootstrap: ServerAppModuleNgFactory,
@@ -51,25 +94,148 @@ app.engine('html', (_, options, callback) =>
       },
       provideModuleMap(LAZY_MODULE_MAP)
     ],
-  })(_, options, callback)
+  })(_, (options as any), callback)
 );
 
+/*
+ * Register the view engines for html and ejs
+ */
 app.set('view engine', 'html');
+
+/*
+ * Set views folder path to directory where template files are stored
+ */
 app.set('views', DIST_FOLDER);
 
-// Example Express Rest API endpoints
-// app.get('/api/**', (req, res) => { });
-// Serve static files from /browser
-app.get('*.*', express.static(DIST_FOLDER, {
-  maxAge: '1y'
-}));
-
-// All regular routes use the Universal engine
-app.get('*', (req, res) => {
-  res.render('index', { req });
-});
-
-// Start up the Node server
-app.listen(PORT, () => {
-  console.log(`Node Express server listening on http://localhost:${PORT}`);
-});
+/**
+ * Proxy the sitemaps
+ */
+app.use('/sitemap**', createProxyMiddleware({ target: `${environment.rest.baseUrl}/sitemaps`, changeOrigin: true }));
+
+/*
+ * Adds a cache control header to the response
+ * The cache control value can be configured in the environments file and defaults to max-age=60
+ */
+function cacheControl(req, res, next) {
+  // instruct browser to revalidate
+  res.header('Cache-Control', environment.cache.control || 'max-age=60');
+  next();
+}
+
+/**
+ * Checks if the rateLimiter property is present
+ * When it is present, the rateLimiter will be enabled. When it is undefined, the rateLimiter will be disabled.
+ */
+if (hasValue((environment.ui as UIServerConfig).rateLimiter)) {
+  const RateLimit = require('express-rate-limit');
+  const limiter = new RateLimit({
+    windowMs: (environment.ui as UIServerConfig).rateLimiter.windowMs,
+    max: (environment.ui as UIServerConfig).rateLimiter.max
+  });
+  app.use(limiter);
+}
+
+/*
+ * Serve static resources (images, i18n messages, …)
+ */
+app.get('*.*', cacheControl, express.static(DIST_FOLDER, { index: false }));
+
+/*
+ * The callback function to serve server side angular
+ */
+function ngApp(req, res) {
+  if (environment.universal.preboot) {
+    res.render(DIST_FOLDER + '/index.html', {
+      req,
+      res,
+      preboot: environment.universal.preboot,
+      async: environment.universal.async,
+      time: environment.universal.time,
+      baseUrl: environment.ui.nameSpace,
+      originUrl: environment.ui.baseUrl,
+      requestUrl: req.originalUrl
+    }, (err, data) => {
+      if (hasNoValue(err) && hasValue(data)) {
+        res.send(data);
+      } else {
+        console.warn('Error in SSR, serving for direct CSR.');
+        if (hasValue(err)) {
+          console.warn('Error details : ', err);
+        }
+        res.sendFile(DIST_FOLDER + '/index.html');
+      }
+    })
+  } else {
+    // If preboot is disabled, just serve the client
+    console.log('Universal off, serving for direct CSR');
+    res.sendFile(DIST_FOLDER + '/index.html');
+  }
+}
+
+// Register the ngApp callback function to handle incoming requests
+app.get('*', ngApp);
+
+/*
+ * Callback function for when the server has started
+ */
+function serverStarted() {
+  console.log(`[${new Date().toTimeString()}] Listening at ${environment.ui.baseUrl}`);
+}
+
+/*
+ * Create an HTTPS server with the configured port and host
+ * @param keys SSL credentials
+ */
+function createHttpsServer(keys) {
+  https.createServer({
+    key: keys.serviceKey,
+    cert: keys.certificate
+  }, app).listen(environment.ui.port, environment.ui.host, () => {
+    serverStarted();
+  });
+}
+
+/*
+ * If SSL is enabled
+ * - Read credentials from configuration files
+ * - Call script to start an HTTPS server with these credentials
+ * When SSL is disabled
+ * - Start an HTTP server on the configured port and host
+ */
+if (environment.ui.ssl) {
+  let serviceKey;
+  try {
+    serviceKey = fs.readFileSync('./config/ssl/key.pem');
+  } catch (e) {
+    console.warn('Service key not found at ./config/ssl/key.pem');
+  }
+
+  let certificate;
+  try {
+    certificate = fs.readFileSync('./config/ssl/cert.pem');
+  } catch (e) {
+    console.warn('Certificate not found at ./config/ssl/key.pem');
+  }
+
+  if (serviceKey && certificate) {
+    createHttpsServer({
+      serviceKey: serviceKey,
+      certificate: certificate
+    });
+  } else {
+    console.warn('Disabling certificate validation and proceeding with a self-signed certificate. If this is a production server, it is recommended that you configure a valid certificate instead.');
+
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // lgtm[js/disabling-certificate-validation]
+
+    pem.createCertificate({
+      days: 1,
+      selfSigned: true
+    }, (error, keys) => {
+      createHttpsServer(keys);
+    });
+  }
+} else {
+  app.listen(environment.ui.port, environment.ui.host, () => {
+    serverStarted();
+  });
+}
diff --git a/src/app/+admin/admin-access-control/admin-access-control-routing-paths.ts b/src/app/+admin/admin-access-control/admin-access-control-routing-paths.ts
new file mode 100644
index 00000000000..2080cb14a78
--- /dev/null
+++ b/src/app/+admin/admin-access-control/admin-access-control-routing-paths.ts
@@ -0,0 +1,8 @@
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { getAccessControlModuleRoute } from '../admin-routing-paths';
+
+export const GROUP_EDIT_PATH = 'groups';
+
+export function getGroupEditRoute(id: string) {
+  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
+}
diff --git a/src/app/+admin/admin-access-control/admin-access-control-routing.module.ts b/src/app/+admin/admin-access-control/admin-access-control-routing.module.ts
index 5af18c778f6..10ac117b0f9 100644
--- a/src/app/+admin/admin-access-control/admin-access-control-routing.module.ts
+++ b/src/app/+admin/admin-access-control/admin-access-control-routing.module.ts
@@ -3,14 +3,7 @@ import { RouterModule } from '@angular/router';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { getAccessControlModulePath } from '../admin-routing.module';
-
-const GROUP_EDIT_PATH = 'groups';
-
-export function getGroupEditPath(id: string) {
-  return new URLCombiner(getAccessControlModulePath(), GROUP_EDIT_PATH, id).toString();
-}
+import { GROUP_EDIT_PATH } from './admin-access-control-routing-paths';
 
 @NgModule({
   imports: [
@@ -20,12 +13,12 @@ export function getGroupEditPath(id: string) {
       {
         path: `${GROUP_EDIT_PATH}/:groupId`,
         component: GroupFormComponent,
-        data: {title: 'admin.registries.schema.title'}
+        data: {title: 'admin.access-control.groups.title.singleGroup'}
       },
       {
         path: `${GROUP_EDIT_PATH}/newGroup`,
         component: GroupFormComponent,
-        data: {title: 'admin.registries.schema.title'}
+        data: {title: 'admin.access-control.groups.title.addGroup'}
       },
     ])
   ]
diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
index 20593756c14..f478557e003 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
@@ -4,90 +4,91 @@
 
       <h2 id="header" class="border-bottom pb-2">{{labelPrefix + 'head' | translate}}</h2>
 
-      <ds-eperson-form *ngIf="isEPersonFormShown" (submitForm)="forceUpdateEPeople()"
+      <ds-eperson-form *ngIf="isEPersonFormShown" (submitForm)="reset()"
                        (cancelForm)="isEPersonFormShown = false"></ds-eperson-form>
 
-      <div *ngIf="!isEPersonFormShown" class="button-row top d-flex pb-2">
-        <button class="mr-auto btn btn-success addEPerson-button"
-                (click)="isEPersonFormShown = true">
-          <i class="fas fa-plus"></i>
-          <span class="d-none d-sm-inline">{{labelPrefix + 'button.add' | translate}}</span>
-        </button>
-      </div>
-
-      <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
-        <button (click)="clearFormAndResetResult();"
-                class="btn btn-primary float-right">{{labelPrefix + 'button.see-all' | translate}}</button>
-      </h3>
-      <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="row">
-        <div class="col-12 col-sm-3">
-          <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
-            <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
-            <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
-          </select>
+      <div *ngIf="!isEPersonFormShown">
+        <div class="button-row top d-flex pb-2">
+          <button class="mr-auto btn btn-success addEPerson-button"
+                  (click)="isEPersonFormShown = true">
+            <i class="fas fa-plus"></i>
+            <span class="d-none d-sm-inline">{{labelPrefix + 'button.add' | translate}}</span>
+          </button>
         </div>
-        <div class="col-sm-9 col-12">
-          <div class="form-group input-group">
-            <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" aria-label="Search input">
-            <span class="input-group-append">
-            <button type="submit"
-                    class="search-button btn btn-secondary">{{ labelPrefix + 'search.button' | translate }}</button>
-        </span>
+
+        <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
+          <button (click)="clearFormAndResetResult();"
+                  class="btn btn-primary float-right">{{labelPrefix + 'button.see-all' | translate}}</button>
+        </h3>
+        <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="row">
+          <div class="col-12 col-sm-3">
+            <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+              <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
+              <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
+            </select>
           </div>
-        </div>
-      </form>
+          <div class="col-sm-9 col-12">
+            <div class="form-group input-group">
+              <input type="text" name="query" id="query" formControlName="query"
+                    class="form-control" aria-label="Search input">
+              <span class="input-group-append">
+              <button type="submit"
+                      class="search-button btn btn-secondary">{{ labelPrefix + 'search.button' | translate }}</button>
+          </span>
+            </div>
+          </div>
+        </form>
 
-      <ds-pagination
-        *ngIf="(ePeople | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(ePeople | async)?.payload"
-        [collectionSize]="(ePeople | async)?.payload?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
+        <ds-pagination
+          *ngIf="(pageInfoState$ | async)?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="pageInfoState$"
+          [collectionSize]="(pageInfoState$ | async)?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true"
+          (pageChange)="onPageChange($event)">
 
-        <div class="table-responsive">
-          <table id="epeople" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
-              <th>{{labelPrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let eperson of (ePeople | async)?.payload?.page"
-                [ngClass]="{'table-primary' : isActive(eperson) | async}">
-              <td>{{eperson.id}}</td>
-              <td>{{eperson.name}}</td>
-              <td>{{eperson.email}}</td>
-              <td>
-                <div class="btn-group edit-field">
-                  <button (click)="toggleEditEPerson(eperson)"
-                          class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.edit' | translate: {name: eperson.name} }}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button (click)="deleteEPerson(eperson)"
-                          class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: eperson.name} }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
+          <div class="table-responsive">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
+                <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
+                <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
+                <th>{{labelPrefix + 'table.edit' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
+                  [ngClass]="{'table-primary' : isActive(epersonDto.eperson) | async}">
+                <td>{{epersonDto.eperson.id}}</td>
+                <td>{{epersonDto.eperson.name}}</td>
+                <td>{{epersonDto.eperson.email}}</td>
+                <td>
+                  <div class="btn-group edit-field">
+                    <button class="delete-button" (click)="toggleEditEPerson(epersonDto.eperson)"
+                            class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
+                            title="{{labelPrefix + 'table.edit.buttons.edit' | translate: {name: epersonDto.eperson.name} }}">
+                      <i class="fas fa-edit fa-fw"></i>
+                    </button>
+                    <button [disabled]="!epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
+                            class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
+                            title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: epersonDto.eperson.name} }}">
+                      <i class="fas fa-trash-alt fa-fw"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
 
-      </ds-pagination>
+        </ds-pagination>
 
-      <div *ngIf="(ePeople | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{labelPrefix + 'no-items' | translate}}
+        <div *ngIf="(pageInfoState$ | async)?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+          {{labelPrefix + 'no-items' | translate}}
+        </div>
       </div>
-
     </div>
   </div>
 </div>
diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts
index 17d8655bdd1..60f9933fb39 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -8,7 +8,7 @@ import { BrowserModule, By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs/internal/Observable';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { FindListOptions } from '../../../core/data/request.models';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
@@ -24,6 +24,8 @@ import { getMockTranslateService } from '../../../shared/mocks/translate.service
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { RequestService } from '../../../core/data/request.service';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
@@ -33,6 +35,8 @@ describe('EPeopleRegistryComponent', () => {
 
   let mockEPeople;
   let ePersonDataServiceStub: any;
+  let authorizationService: AuthorizationDataService;
+  let modalService;
 
   beforeEach(async(() => {
     mockEPeople = [EPersonMock, EPersonMock2];
@@ -40,7 +44,7 @@ describe('EPeopleRegistryComponent', () => {
       activeEPerson: null,
       allEpeople: mockEPeople,
       getEPeople(): Observable<RemoteData<PaginatedList<EPerson>>> {
-        return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: this.allEpeople.length, totalElements: this.allEpeople.length, totalPages: 1, currentPage: 1 }), this.allEpeople));
       },
       getActiveEPerson(): Observable<EPerson> {
         return observableOf(this.activeEPerson);
@@ -50,18 +54,18 @@ describe('EPeopleRegistryComponent', () => {
           const result = this.allEpeople.find((ePerson: EPerson) => {
             return ePerson.email === query
           });
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: [result].length, totalElements: [result].length, totalPages: 1, currentPage: 1 }), [result]));
         }
         if (scope === 'metadata') {
           if (query === '') {
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: this.allEpeople.length, totalElements: this.allEpeople.length, totalPages: 1, currentPage: 1 }), this.allEpeople));
           }
           const result = this.allEpeople.find((ePerson: EPerson) => {
             return (ePerson.name.includes(query) || ePerson.email.includes(query))
           });
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: [result].length, totalElements: [result].length, totalPages: 1, currentPage: 1 }), [result]));
         }
-        return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: this.allEpeople.length, totalElements: this.allEpeople.length, totalPages: 1, currentPage: 1 }), this.allEpeople));
       },
       deleteEPerson(ePerson: EPerson): Observable<boolean> {
         this.allEpeople = this.allEpeople.filter((ePerson2: EPerson) => {
@@ -82,6 +86,9 @@ describe('EPeopleRegistryComponent', () => {
         return '/admin/access-control/epeople';
       }
     };
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
     TestBed.configureTestingModule({
@@ -94,11 +101,13 @@ describe('EPeopleRegistryComponent', () => {
         }),
       ],
       declarations: [EPeopleRegistryComponent],
-      providers: [EPeopleRegistryComponent,
+      providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: FormBuilderService, useValue: builderService },
         { provide: Router, useValue: new RouterStub() },
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -107,12 +116,14 @@ describe('EPeopleRegistryComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(EPeopleRegistryComponent);
     component = fixture.componentInstance;
+    modalService = (component as any).modalService;
+    spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
     fixture.detectChanges();
   });
 
-  it('should create EPeopleRegistryComponent', inject([EPeopleRegistryComponent], (comp: EPeopleRegistryComponent) => {
-    expect(comp).toBeDefined();
-  }));
+  it('should create EPeopleRegistryComponent', () => {
+    expect(component).toBeDefined();
+  });
 
   it('should display list of ePeople', () => {
     const ePeopleIdsFound = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
@@ -175,7 +186,7 @@ describe('EPeopleRegistryComponent', () => {
       it('editEPerson form is toggled', () => {
         const ePeopleIds = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
         ePersonDataServiceStub.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-          if (activeEPerson === ePeopleIds[0].nativeElement.textContent) {
+          if (ePeopleIds[0] && activeEPerson === ePeopleIds[0].nativeElement.textContent) {
             expect(component.isEPersonFormShown).toEqual(false);
           } else {
             expect(component.isEPersonFormShown).toEqual(true);
@@ -183,6 +194,10 @@ describe('EPeopleRegistryComponent', () => {
 
         })
       });
+
+      it('EPerson search section is hidden', () => {
+        expect(fixture.debugElement.query(By.css('#search'))).toBeNull();
+      });
     });
   });
 
@@ -211,4 +226,20 @@ describe('EPeopleRegistryComponent', () => {
     });
   });
 
+  describe('delete EPerson button when the isAuthorized returns false', () => {
+    let ePeopleDeleteButton;
+    beforeEach(() => {
+      authorizationService = jasmine.createSpyObj('authorizationService', {
+        isAuthorized: observableOf(false)
+      });
+    });
+
+    it ('should be disabled', () => {
+      ePeopleDeleteButton = fixture.debugElement.queryAll(By.css('#epeople tr td div button.delete-button'));
+      ePeopleDeleteButton.forEach((deleteButton) => {
+        expect(deleteButton.nativeElement.disabled).toBe(true);
+      });
+
+    })
+  })
 });
diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
index e88ba844187..8122e8483d0 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
@@ -2,16 +2,29 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { Subscription } from 'rxjs/internal/Subscription';
-import { map, take } from 'rxjs/operators';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { map, switchMap, take } from 'rxjs/operators';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { EpersonDtoModel } from '../../../core/eperson/models/eperson-dto.model';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { RequestService } from '../../../core/data/request.service';
+import { filter } from 'rxjs/internal/operators/filter';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-epeople-registry',
@@ -28,7 +41,17 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
   /**
    * A list of all the current EPeople within the repository or the result of the search
    */
-  ePeople: Observable<RemoteData<PaginatedList<EPerson>>>;
+  ePeople$: BehaviorSubject<RemoteData<PaginatedList<EPerson>>> = new BehaviorSubject<RemoteData<PaginatedList<EPerson>>>({} as any);
+  /**
+   * A BehaviorSubject with the list of EpersonDtoModel objects made from the EPeople in the repository or
+   * as the result of the search
+   */
+  ePeopleDto$: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>({} as any);
+
+  /**
+   * An observable for the pageInfo, needed to pass to the pagination component
+   */
+  pageInfoState$: BehaviorSubject<PageInfo> = new BehaviorSubject<PageInfo>(undefined);
 
   /**
    * Pagination config used to display the list of epeople
@@ -59,8 +82,11 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
   constructor(private epersonService: EPersonDataService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
+              private authorizationService: AuthorizationDataService,
               private formBuilder: FormBuilder,
-              private router: Router) {
+              private router: Router,
+              private modalService: NgbModal,
+              public requestService: RequestService) {
     this.currentSearchQuery = '';
     this.currentSearchScope = 'metadata';
     this.searchForm = this.formBuilder.group(({
@@ -70,6 +96,13 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.initialisePage();
+  }
+
+  /**
+   * This method will initialise the page
+   */
+  initialisePage() {
     this.isEPersonFormShown = false;
     this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery });
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
@@ -84,18 +117,10 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    * @param event
    */
   onPageChange(event) {
-    this.config.currentPage = event;
-    this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery })
-  }
-
-  /**
-   * Force-update the list of EPeople by first clearing the cache related to EPeople, then performing
-   * a new REST call
-   */
-  public forceUpdateEPeople() {
-    this.epersonService.clearEPersonRequests();
-    this.isEPersonFormShown = false;
-    this.search({ query: '', scope: 'metadata' })
+    if (this.config.currentPage !== event) {
+      this.config.currentPage = event;
+      this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery })
+    }
   }
 
   /**
@@ -115,10 +140,34 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
       this.currentSearchScope = scope;
       this.config.currentPage = 1;
     }
-    this.ePeople = this.epersonService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
+    this.subs.push(this.epersonService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
       currentPage: this.config.currentPage,
       elementsPerPage: this.config.pageSize
-    });
+    }).subscribe((peopleRD) => {
+        this.ePeople$.next(peopleRD);
+        this.pageInfoState$.next(peopleRD.payload.pageInfo);
+      }
+    ));
+
+    this.subs.push(this.ePeople$.pipe(
+        getAllSucceededRemoteDataPayload(),
+        switchMap((epeople) => {
+          return combineLatest(...epeople.page.map((eperson) => {
+            return this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined).pipe(
+                      map((authorized) => {
+                        const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
+                        epersonDtoModel.ableToDelete = authorized;
+                        epersonDtoModel.eperson = eperson;
+                        return epersonDtoModel;
+                      })
+                  );
+          })).pipe(map((dtos: EpersonDtoModel[]) => {
+              return buildPaginatedList(epeople.pageInfo, dtos);
+          }))
+        })).subscribe((value) => {
+          this.ePeopleDto$.next(value);
+          this.pageInfoState$.next(value.pageInfo);
+        }));
   }
 
   /**
@@ -160,16 +209,25 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    */
   deleteEPerson(ePerson: EPerson) {
     if (hasValue(ePerson.id)) {
-      this.epersonService.deleteEPerson(ePerson).pipe(take(1)).subscribe((success: boolean) => {
-        if (success) {
-          this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: ePerson.name }));
-          this.forceUpdateEPeople();
-        } else {
-          this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.deleted.failure', { name: ePerson.name }));
-        }
-        this.epersonService.cancelEditEPerson();
-        this.isEPersonFormShown = false;
-      })
+      const modalRef = this.modalService.open(ConfirmationModalComponent);
+      modalRef.componentInstance.dso = ePerson;
+      modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
+      modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
+      modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
+      modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-eperson.confirm';
+      modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => {
+        if (confirm) {
+          if (hasValue(ePerson.id)) {
+            this.epersonService.deleteEPerson(ePerson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData<NoContent>) => {
+              if (restResponse.hasSucceeded) {
+                this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: ePerson.name }));
+                this.reset();
+              } else {
+                this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + ePerson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage);
+              }
+            })
+          }}
+      });
     }
   }
 
@@ -177,6 +235,10 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    * Unsub all subscriptions
    */
   ngOnDestroy(): void {
+    this.cleanupSubscribes();
+  }
+
+  cleanupSubscribes() {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
@@ -199,4 +261,18 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     });
     this.search({ query: '' });
   }
+
+  /**
+   * This method will ensure that the page gets reset and that the cache is cleared
+   */
+  reset() {
+    this.epersonService.getBrowseEndpoint().pipe(
+        switchMap((href) => this.requestService.removeByHrefSubstring(href)),
+        filter((isCached) => isCached),
+        take(1)
+    ).subscribe(() => {
+      this.cleanupSubscribes();
+      this.initialisePage();
+    });
+  }
 }
diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html
index b87b3e08482..3f744240e5c 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -17,10 +17,10 @@ <h4>{{messagePrefix + '.edit' | translate}}</h4>
   <button class="btn btn-light" [disabled]="!(canReset$ | async)">
     <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
   </button>
-  <button class="btn btn-light" [disabled]="!(canDelete$ | async)">
+  <button class="btn btn-light delete-button" [disabled]="!(canDelete$ | async)" (click)="delete()">
     <i class="fa fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
   </button>
-  <button *ngIf="!isImpersonated" class="btn btn-light" [disabled]="!(canImpersonate$ | async)" (click)="impersonate()">
+  <button *ngIf="!isImpersonated" class="btn btn-light" [ngClass]="{'d-none' : !(canImpersonate$ | async)}" (click)="impersonate()">
     <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
   </button>
   <button *ngIf="isImpersonated" class="btn btn-light" (click)="stopImpersonating()">
diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index 693f3cf9164..36b9360899e 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -1,48 +1,43 @@
-import { HttpClient } from '@angular/common/http';
-import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule } from '@angular/platform-browser';
+import { BrowserModule, By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs/internal/Observable';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { RestResponse } from '../../../../core/cache/response.models';
-import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { FindListOptions } from '../../../../core/data/request.models';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { UUIDService } from '../../../../core/shared/uuid.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { EPeopleRegistryComponent } from '../epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form.component';
 import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { AuthService } from '../../../../core/auth/auth.service';
 import { AuthServiceStub } from '../../../../shared/testing/auth-service.stub';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { RequestService } from '../../../../core/data/request.service';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
   let fixture: ComponentFixture<EPersonFormComponent>;
-  let translateService: TranslateService;
   let builderService: FormBuilderService;
 
   let mockEPeople;
   let ePersonDataServiceStub: any;
   let authService: AuthServiceStub;
+  let authorizationService: AuthorizationDataService;
+  let groupsDataService: GroupDataService;
 
   beforeEach(async(() => {
     mockEPeople = [EPersonMock, EPersonMock2];
@@ -50,7 +45,7 @@ describe('EPersonFormComponent', () => {
       activeEPerson: null,
       allEpeople: mockEPeople,
       getEPeople(): Observable<RemoteData<PaginatedList<EPerson>>> {
-        return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(null, this.allEpeople));
       },
       getActiveEPerson(): Observable<EPerson> {
         return observableOf(this.activeEPerson);
@@ -60,18 +55,18 @@ describe('EPersonFormComponent', () => {
           const result = this.allEpeople.find((ePerson: EPerson) => {
             return ePerson.email === query
           });
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [result]));
         }
         if (scope === 'metadata') {
           if (query === '') {
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(null, this.allEpeople));
           }
           const result = this.allEpeople.find((ePerson: EPerson) => {
             return (ePerson.name.includes(query) || ePerson.email.includes(query))
           });
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [result]));
         }
-        return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(null, this.allEpeople));
       },
       deleteEPerson(ePerson: EPerson): Observable<boolean> {
         this.allEpeople = this.allEpeople.filter((ePerson2: EPerson) => {
@@ -79,8 +74,9 @@ describe('EPersonFormComponent', () => {
         });
         return observableOf(true);
       },
-      create(ePerson: EPerson) {
-        this.allEpeople = [...this.allEpeople, ePerson]
+      create(ePerson: EPerson): Observable<RemoteData<EPerson>> {
+        this.allEpeople = [...this.allEpeople, ePerson];
+        return createSuccessfulRemoteDataObject$(ePerson);
       },
       editEPerson(ePerson: EPerson) {
         this.activeEPerson = ePerson;
@@ -91,23 +87,24 @@ describe('EPersonFormComponent', () => {
       clearEPersonRequests(): void {
         // empty
       },
-      tryToCreate(ePerson: EPerson): Observable<RestResponse> {
-        this.allEpeople = [...this.allEpeople, ePerson]
-        return observableOf(new RestResponse(true, 200, 'Success'));
-      },
-      updateEPerson(ePerson: EPerson): Observable<RestResponse> {
+      updateEPerson(ePerson: EPerson): Observable<RemoteData<EPerson>> {
         this.allEpeople.forEach((ePersonInList: EPerson, i: number) => {
           if (ePersonInList.id === ePerson.id) {
             this.allEpeople[i] = ePerson;
           }
         });
-        return observableOf(new RestResponse(true, 200, 'Success'));
-
+        return createSuccessfulRemoteDataObject$(ePerson);
       }
     };
     builderService = getMockFormBuilderService();
-    translateService = getMockTranslateService();
     authService = new AuthServiceStub();
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    groupsDataService = jasmine.createSpyObj('groupsDataService', {
+      findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+      getGroupRegistryRouterLink: ''
+    });
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
@@ -117,20 +114,15 @@ describe('EPersonFormComponent', () => {
           }
         }),
       ],
-      declarations: [EPeopleRegistryComponent, EPersonFormComponent],
-      providers: [EPersonFormComponent,
+      declarations: [EPersonFormComponent],
+      providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: GroupDataService, useValue: groupsDataService },
         { provide: FormBuilderService, useValue: builderService },
-        { provide: DSOChangeAnalyzer, useValue: {} },
-        { provide: HttpClient, useValue: {} },
-        { provide: ObjectCacheService, useValue: {} },
-        { provide: UUIDService, useValue: {} },
-        { provide: Store, useValue: {} },
-        { provide: RemoteDataBuildService, useValue: {} },
-        { provide: HALEndpointService, useValue: {} },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: AuthService, useValue: authService },
-        EPeopleRegistryComponent
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -142,9 +134,9 @@ describe('EPersonFormComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create EPersonFormComponent', inject([EPersonFormComponent], (comp: EPersonFormComponent) => {
-    expect(comp).toBeDefined();
-  }));
+  it('should create EPersonFormComponent', () => {
+    expect(component).toBeDefined();
+  });
 
   describe('when submitting the form', () => {
     let firstName;
@@ -269,4 +261,53 @@ describe('EPersonFormComponent', () => {
     });
   });
 
+  describe('delete', () => {
+
+    let ePersonId;
+    let eperson: EPerson;
+    let modalService;
+
+    beforeEach(() => {
+      spyOn(authService, 'impersonate').and.callThrough();
+      ePersonId = 'testEPersonId';
+      eperson = EPersonMock;
+      component.epersonInitial = eperson;
+      component.canDelete$ = observableOf(true);
+      spyOn(component.epersonService, 'getActiveEPerson').and.returnValue(observableOf(eperson));
+      modalService = (component as any).modalService;
+      spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+      fixture.detectChanges()
+
+    });
+
+    it ('the delete button should be active if the eperson can be deleted', () => {
+      const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
+      expect(deleteButton.nativeElement.disabled).toBe(false);
+    });
+
+    it ('the delete button should be disabled if the eperson cannot be deleted', () => {
+      component.canDelete$ = observableOf(false);
+      fixture.detectChanges()
+      const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
+      expect(deleteButton.nativeElement.disabled).toBe(true);
+    });
+
+    it ('should call the epersonFormComponent delete when clicked on the button' , () => {
+      spyOn(component, 'delete').and.stub();
+      spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
+      const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
+      deleteButton.triggerEventHandler('click', null);
+      expect(component.delete).toHaveBeenCalled();
+    });
+
+    it ('should call the epersonService delete when clicked on the button' , () => {
+      // ePersonDataServiceStub.activeEPerson = eperson;
+      spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
+      const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
+      expect(deleteButton.nativeElement.disabled).toBe(false);
+      deleteButton.triggerEventHandler('click', null);
+      fixture.detectChanges()
+      expect(component.epersonService.deleteEPerson).toHaveBeenCalledWith(eperson);
+    });
+  })
 });
diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 9e3bcc88c01..6f0ad23f787 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -9,20 +9,29 @@ import {
 import { TranslateService } from '@ngx-translate/core';
 import { Subscription, combineLatest, of } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
-import { take } from 'rxjs/operators';
-import { RestResponse } from '../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { switchMap, take } from 'rxjs/operators';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../core/eperson/models/group.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
+} from '../../../../core/shared/operators';
 import { hasValue } from '../../../../shared/empty.util';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { AuthService } from '../../../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { ConfirmationModalComponent } from '../../../../shared/confirmation-modal/confirmation-modal.component';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { RequestService } from '../../../../core/data/request.service';
+import { NoContent } from '../../../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-eperson-form',
@@ -114,15 +123,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
 
   /**
    * Observable whether or not the admin is allowed to delete the EPerson
-   * TODO: Initialize the observable once the REST API supports this (currently hardcoded to return false)
    */
-  canDelete$: Observable<boolean> = of(false);
+  canDelete$: Observable<boolean>;
 
   /**
    * Observable whether or not the admin is allowed to impersonate the EPerson
-   * TODO: Initialize the observable once the REST API supports this (currently hardcoded to return true)
    */
-  canImpersonate$: Observable<boolean> = of(true);
+  canImpersonate$: Observable<boolean>;
 
   /**
    * List of subscriptions
@@ -158,7 +165,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
               private formBuilderService: FormBuilderService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
-              private authService: AuthService) {
+              private authService: AuthService,
+              private authorizationService: AuthorizationDataService,
+              private modalService: NgbModal,
+              public requestService: RequestService) {
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
       this.epersonInitial = eperson;
       if (hasValue(eperson)) {
@@ -168,13 +178,20 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.initialisePage();
+  }
+
+  /**
+   * This method will initialise the page
+   */
+  initialisePage() {
     combineLatest(
-      this.translateService.get(`${this.messagePrefix}.firstName`),
-      this.translateService.get(`${this.messagePrefix}.lastName`),
-      this.translateService.get(`${this.messagePrefix}.email`),
-      this.translateService.get(`${this.messagePrefix}.canLogIn`),
-      this.translateService.get(`${this.messagePrefix}.requireCertificate`),
-      this.translateService.get(`${this.messagePrefix}.emailHint`),
+        this.translateService.get(`${this.messagePrefix}.firstName`),
+        this.translateService.get(`${this.messagePrefix}.lastName`),
+        this.translateService.get(`${this.messagePrefix}.email`),
+        this.translateService.get(`${this.messagePrefix}.canLogIn`),
+        this.translateService.get(`${this.messagePrefix}.requireCertificate`),
+        this.translateService.get(`${this.messagePrefix}.emailHint`),
     ).subscribe(([firstName, lastName, email, canLogIn, requireCertificate, emailHint]) => {
       this.firstName = new DynamicInputModel({
         id: 'firstName',
@@ -206,19 +223,19 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         hint: emailHint
       });
       this.canLogIn = new DynamicCheckboxModel(
-        {
-          id: 'canLogIn',
-          label: canLogIn,
-          name: 'canLogIn',
-          value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
-        });
+          {
+            id: 'canLogIn',
+            label: canLogIn,
+            name: 'canLogIn',
+            value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
+          });
       this.requireCertificate = new DynamicCheckboxModel(
-        {
-          id: 'requireCertificate',
-          label: requireCertificate,
-          name: 'requireCertificate',
-          value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false)
-        });
+          {
+            id: 'requireCertificate',
+            label: requireCertificate,
+            name: 'requireCertificate',
+            value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false)
+          });
       this.formModel = [
         this.firstName,
         this.lastName,
@@ -242,6 +259,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           requireCertificate: eperson != null ? eperson.requireCertificate : false
         });
       }));
+      this.canImpersonate$ = this.epersonService.getActiveEPerson().pipe(
+          switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, hasValue(eperson) ? eperson.self : undefined))
+      );
+      this.canDelete$ = this.epersonService.getActiveEPerson().pipe(
+          switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
+      );
     });
   }
 
@@ -295,9 +318,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   createNewEPerson(values) {
     const ePersonToCreate = Object.assign(new EPerson(), values);
 
-    const response = this.epersonService.tryToCreate(ePersonToCreate);
-    response.pipe(take(1)).subscribe((restResponse: RestResponse) => {
-      if (restResponse.isSuccessful) {
+    const response = this.epersonService.create(ePersonToCreate);
+    response.pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((rd: RemoteData<EPerson>) => {
+      if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: ePersonToCreate.name }));
         this.submitForm.emit(ePersonToCreate);
       } else {
@@ -335,8 +360,8 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     });
 
     const response = this.epersonService.updateEPerson(editedEperson);
-    response.pipe(take(1)).subscribe((restResponse: RestResponse) => {
-      if (restResponse.isSuccessful) {
+    response.pipe(take(1)).subscribe((rd: RemoteData<EPerson>) => {
+      if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: editedEperson.name }));
         this.submitForm.emit(editedEperson);
       } else {
@@ -361,7 +386,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     this.subs.push(this.epersonService.searchByScope('email', ePerson.email, {
       currentPage: 1,
       elementsPerPage: 0
-    }).pipe(getSucceededRemoteData(), getRemoteDataPayload())
+    }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
       .subscribe((list: PaginatedList<EPerson>) => {
         if (list.totalElements > 0) {
           this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.' + notificationSection + '.failure.emailInUse', {
@@ -400,6 +425,35 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     this.isImpersonated = true;
   }
 
+  /**
+   * Deletes the EPerson from the Repository. The EPerson will be the only that this form is showing.
+   * It'll either show a success or error message depending on whether the delete was successful or not.
+   */
+  delete() {
+      this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => {
+        const modalRef = this.modalService.open(ConfirmationModalComponent);
+        modalRef.componentInstance.dso = eperson;
+        modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
+        modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
+        modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
+        modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-eperson.confirm';
+        modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => {
+          if (confirm) {
+            if (hasValue(eperson.id)) {
+              this.epersonService.deleteEPerson(eperson).pipe(take(1)).subscribe((restResponse: RemoteData<NoContent>) => {
+                if (restResponse.hasSucceeded) {
+                  this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: eperson.name }));
+                  this.reset();
+                } else {
+                  this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + eperson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage);
+                }
+                this.cancelForm.emit();
+              })
+            }}
+        });
+    })
+  }
+
   /**
    * Stop impersonating the EPerson
    */
@@ -415,4 +469,14 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     this.onCancel();
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
+
+  /**
+   * This method will ensure that the page gets reset and that the cache is cleared
+   */
+  reset() {
+    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => {
+      this.requestService.removeByHrefSubstring(eperson.self);
+    });
+    this.initialisePage();
+  }
 }
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html
index 2f76e454296..a0d8a452558 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html
@@ -1,6 +1,11 @@
 <div class="container">
   <div class="group-form row">
     <div class="col-12">
+      <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
+                [content]="messagePrefix + '.alert.permanent'"></ds-alert>
+      <ds-alert *ngIf="!(canEdit$ | async) && (groupDataService.getActiveGroup() | async)" [type]="AlertTypeEnum.Warning"
+                [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: (getLinkedDSO(groupBeingEdited) | async)?.payload?.name, comcol: (getLinkedDSO(groupBeingEdited) | async)?.payload?.type, comcolEditRolesRoute: (getLinkedEditRolesRoute(groupBeingEdited) | async) })">
+      </ds-alert>
 
       <div *ngIf="groupDataService.getActiveGroup() | async; then editheader; else createHeader"></div>
 
@@ -18,10 +23,18 @@ <h2 class="border-bottom pb-2">{{messagePrefix + '.head.edit' | translate}}</h2>
                [formLayout]="formLayout"
                (cancel)="onCancel()"
                (submitForm)="onSubmit()">
+        <div *ngIf="groupBeingEdited != null" class="row">
+          <button class="btn btn-light delete-button" [disabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
+                  (click)="delete()">
+            <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
+          </button>
+        </div>
       </ds-form>
 
-      <ds-members-list *ngIf="groupBeingEdited != null" [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
-      <ds-subgroups-list *ngIf="groupBeingEdited != null"  [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
+      <ds-members-list *ngIf="groupBeingEdited != null"
+                       [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
+      <ds-subgroups-list *ngIf="groupBeingEdited != null"
+                         [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
 
       <div>
         <button [routerLink]="[this.groupDataService.getGroupRegistryRouterLink()]"
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts
index 5878500f1d7..e07e9ade606 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts
@@ -12,13 +12,15 @@ import { of as observableOf } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { DSpaceObjectDataService } from '../../../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
@@ -32,6 +34,7 @@ import { getMockTranslateService } from '../../../../shared/mocks/translate.serv
 import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { Operation } from 'fast-json-patch';
 
 describe('GroupFormComponent', () => {
   let component: GroupFormComponent;
@@ -40,6 +43,9 @@ describe('GroupFormComponent', () => {
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
+  let dsoDataServiceStub: any;
+  let authorizationService: AuthorizationDataService;
+  let notificationService: NotificationsServiceStub;
   let router;
 
   let groups;
@@ -65,6 +71,7 @@ describe('GroupFormComponent', () => {
     groupsDataServiceStub = {
       allGroups: groups,
       activeGroup: null,
+      createdGroup: null,
       getActiveGroup(): Observable<Group> {
         return observableOf(this.activeGroup);
       },
@@ -74,23 +81,47 @@ describe('GroupFormComponent', () => {
       editGroup(group: Group) {
         this.activeGroup = group
       },
+      clearGroupsRequests() {
+        return null;
+      },
+      patch(group: Group, operations: Operation[]) {
+        return null;
+      },
       cancelEditGroup(): void {
         this.activeGroup = null;
       },
       findById(id: string) {
         return observableOf({ payload: null, hasSucceeded: true });
       },
-      tryToCreate(group: Group): Observable<RestResponse> {
-        this.allGroups = [...this.allGroups, group]
-        return observableOf(new RestResponse(true, 200, 'Success'));
+      findByHref(href: string) {
+        return createSuccessfulRemoteDataObject$(this.createdGroup);
+      },
+      create(group: Group): Observable<RemoteData<Group>> {
+        this.allGroups = [...this.allGroups, group];
+        this.createdGroup = Object.assign({}, group, {
+          _links: { self: { href: 'group-selflink' } }
+        });
+        return createSuccessfulRemoteDataObject$(this.createdGroup);
       },
       searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []))
+      },
+      getGroupEditPageRouterLinkWithID(id: string) {
+        return `group-edit-page-for-${id}`;
       }
     };
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    dsoDataServiceStub = {
+      findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
+        return null;
+      }
+    }
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
     router = new RouterMock();
+    notificationService = new NotificationsServiceStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
@@ -104,7 +135,8 @@ describe('GroupFormComponent', () => {
       providers: [GroupFormComponent,
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataServiceStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: DSpaceObjectDataService, useValue: dsoDataServiceStub },
+        { provide: NotificationsService, useValue: notificationService },
         { provide: FormBuilderService, useValue: builderService },
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: HttpClient, useValue: {} },
@@ -115,6 +147,7 @@ describe('GroupFormComponent', () => {
         { provide: HALEndpointService, useValue: {} },
         { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) } },
         { provide: Router, useValue: router },
+        { provide: AuthorizationDataService, useValue: authorizationService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -148,6 +181,34 @@ describe('GroupFormComponent', () => {
         });
       }));
     });
+    describe('with active Group', () => {
+      beforeEach(() => {
+        spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(observableOf(expected));
+        spyOn(groupsDataServiceStub, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(expected));
+        component.groupName.value = 'newGroupName';
+        component.onSubmit();
+        fixture.detectChanges();
+      });
+
+      it('should emit the existing group using the correct new values', async(() => {
+        const expected2 = Object.assign(new Group(), {
+          name: 'newGroupName',
+          metadata: {
+            'dc.description': [
+              {
+                value: groupDescription
+              }
+            ],
+          },
+        });
+        fixture.whenStable().then(() => {
+          expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
+        });
+      }));
+      it('should emit success notification', () => {
+        expect(notificationService.success).toHaveBeenCalled();
+      })
+    });
   });
 
 });
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
index d81eac1e921..104aec46ae0 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, HostListener, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormControlModel,
   DynamicFormLayout,
@@ -8,18 +9,41 @@ import {
   DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs/internal/observable/combineLatest';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { take } from 'rxjs/operators';
-import { RestResponse } from '../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import {
+  ObservedValueOf,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription
+} from 'rxjs';
+import { catchError, map, switchMap, take } from 'rxjs/operators';
+import { getCollectionEditRolesRoute } from '../../../../+collection-page/collection-page-routing-paths';
+import { getCommunityEditRolesRoute } from '../../../../+community-page/community-page-routing-paths';
+import { DSpaceObjectDataService } from '../../../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Group } from '../../../../core/eperson/models/group.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
+} from '../../../../core/shared/operators';
+import { AlertType } from '../../../../shared/alert/aletr-type';
+import { ConfirmationModalComponent } from '../../../../shared/confirmation-modal/confirmation-modal.component';
+import { hasValue, isNotEmpty, hasValueOperator } from '../../../../shared/empty.util';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { NoContent } from '../../../../core/shared/NoContent.model';
+import { Operation } from 'fast-json-patch';
 
 @Component({
   selector: 'ds-group-form',
@@ -89,22 +113,52 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   groupBeingEdited: Group;
 
+  /**
+   * Observable whether or not the logged in user is allowed to delete the Group & doesn't have a linked object (community / collection linked to workspace group
+   */
+  canEdit$: Observable<boolean>;
+
+  /**
+   * The AlertType enumeration
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
   constructor(public groupDataService: GroupDataService,
               private ePersonDataService: EPersonDataService,
+              private dSpaceObjectDataService: DSpaceObjectDataService,
               private formBuilderService: FormBuilderService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
               private route: ActivatedRoute,
-              protected router: Router) {
+              protected router: Router,
+              private authorizationService: AuthorizationDataService,
+              private modalService: NgbModal,
+              public requestService: RequestService) {
   }
 
   ngOnInit() {
+    this.initialisePage();
+  }
+
+  initialisePage() {
     this.subs.push(this.route.params.subscribe((params) => {
       this.setActiveGroup(params.groupId)
     }));
-    combineLatest(
+    this.canEdit$ = this.groupDataService.getActiveGroup().pipe(
+      hasValueOperator(),
+      switchMap((group: Group) => {
+        return observableCombineLatest(
+          this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(group) ? group.self : undefined),
+          this.hasLinkedDSO(group),
+          (isAuthorized: ObservedValueOf<Observable<boolean>>, hasLinkedDSO: ObservedValueOf<Observable<boolean>>) => {
+            return isAuthorized && !hasLinkedDSO;
+          })
+      })
+    );
+    observableCombineLatest(
       this.translateService.get(`${this.messagePrefix}.groupName`),
-      this.translateService.get(`${this.messagePrefix}.groupDescription`),
+      this.translateService.get(`${this.messagePrefix}.groupDescription`)
     ).subscribe(([groupName, groupDescription]) => {
       this.groupName = new DynamicInputModel({
         id: 'groupName',
@@ -123,21 +177,26 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       });
       this.formModel = [
         this.groupName,
-        this.groupDescription
+        this.groupDescription,
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.subs.push(this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
-        if (activeGroup != null) {
-          this.groupBeingEdited = activeGroup;
-          this.formGroup.patchValue({
-            groupName: activeGroup != null ? activeGroup.name : '',
-            groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
-          });
-          if (activeGroup.permanent) {
-            this.formGroup.get('groupName').disable();
+      this.subs.push(
+        observableCombineLatest(
+          this.groupDataService.getActiveGroup(),
+          this.canEdit$
+        ).subscribe(([activeGroup, canEdit]) => {
+          if (activeGroup != null) {
+            this.groupBeingEdited = activeGroup;
+            this.formGroup.patchValue({
+              groupName: activeGroup != null ? activeGroup.name : '',
+              groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
+            });
+            if (!canEdit || activeGroup.permanent) {
+              this.formGroup.disable();
+            }
           }
-        }
-      }));
+        })
+      );
     });
   }
 
@@ -172,7 +231,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
         if (group === null) {
           this.createNewGroup(values);
         } else {
-          this.editGroup(group, values);
+          this.editGroup(group);
         }
       }
     );
@@ -184,16 +243,17 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   createNewGroup(values) {
     const groupToCreate = Object.assign(new Group(), values);
-    const response = this.groupDataService.tryToCreate(groupToCreate);
-    response.pipe(take(1)).subscribe((restResponse: RestResponse) => {
-      if (restResponse.isSuccessful) {
+    this.groupDataService.create(groupToCreate).pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((rd: RemoteData<Group>) => {
+      if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.created.success', { name: groupToCreate.name }));
         this.submitForm.emit(groupToCreate);
-        const resp: any = restResponse;
-        if (isNotEmpty(resp.resourceSelfLinks)) {
-          const groupSelfLink = resp.resourceSelfLinks[0];
+        if (isNotEmpty(rd.payload)) {
+          const groupSelfLink = rd.payload._links.self.href;
           this.setActiveGroupWithLink(groupSelfLink);
-          this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLinkWithID(this.groupDataService.getUUIDFromString(groupSelfLink)));
+          this.groupDataService.clearGroupsRequests();
+          this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLinkWithID(rd.payload.uuid));
         }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.created.failure', { name: groupToCreate.name }));
@@ -214,7 +274,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.subs.push(this.groupDataService.searchGroups(group.name, {
       currentPage: 1,
       elementsPerPage: 0
-    }).pipe(getSucceededRemoteData(), getRemoteDataPayload())
+    }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
       .subscribe((list: PaginatedList<Group>) => {
         if (list.totalElements > 0) {
           this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.' + notificationSection + '.failure.groupNameInUse', {
@@ -225,14 +285,39 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * // TODO
-   * @param group
-   * @param values
+   * Edit existing Group based on given values from form and old Group
+   * @param group   Group to edit and old values contained within
    */
-  editGroup(group: Group, values) {
-    // TODO (backend)
-    console.log('TODO implement editGroup', values);
-    this.notificationsService.error('TODO implement editGroup (not yet implemented in backend) ');
+  editGroup(group: Group) {
+    let operations: Operation[] = []
+
+    if (hasValue(this.groupDescription.value)) {
+      operations = [...operations, {
+        op: 'replace',
+        path: '/metadata/dc.description/0/value',
+        value: this.groupDescription.value
+      }];
+    }
+
+    if (hasValue(this.groupName.value)) {
+      operations = [...operations, {
+        op: 'replace',
+        path: '/name',
+        value: this.groupName.value
+      }];
+    }
+
+    this.groupDataService.patch(group, operations).pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((rd: RemoteData<Group>) => {
+      if (rd.hasSucceeded) {
+        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.edited.success', { name: rd.payload.name }));
+        this.submitForm.emit(rd.payload);
+      } else {
+        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.edited.failure', { name: group.name }));
+        this.cancelForm.emit();
+      }
+    });
   }
 
   /**
@@ -243,7 +328,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.groupDataService.cancelEditGroup();
     this.groupDataService.findById(groupId)
       .pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         getRemoteDataPayload())
       .subscribe((group: Group) => {
         this.groupDataService.editGroup(group);
@@ -258,9 +343,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup === null) {
         this.groupDataService.cancelEditGroup();
-        this.groupDataService.findByHref(groupSelfLink)
+        this.groupDataService.findByHref(groupSelfLink, false, followLink('subgroups'), followLink('epersons'), followLink('object'))
           .pipe(
-            getSucceededRemoteData(),
+            getFirstSucceededRemoteData(),
             getRemoteDataPayload())
           .subscribe((group: Group) => {
             this.groupDataService.editGroup(group);
@@ -269,6 +354,48 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     });
   }
 
+  /**
+   * Deletes the Group from the Repository. The Group will be the only that this form is showing.
+   * It'll either show a success or error message depending on whether the delete was successful or not.
+   */
+  delete() {
+    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((group: Group) => {
+      const modalRef = this.modalService.open(ConfirmationModalComponent);
+      modalRef.componentInstance.dso = group;
+      modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-group.modal.header';
+      modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-group.modal.info';
+      modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-group.modal.cancel';
+      modalRef.componentInstance.confirmLabel = this.messagePrefix + '.delete-group.modal.confirm';
+      modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => {
+        if (confirm) {
+          if (hasValue(group.id)) {
+            this.groupDataService.delete(group.id).pipe(getFirstCompletedRemoteData())
+              .subscribe((rd: RemoteData<NoContent>) => {
+                if (rd.hasSucceeded) {
+                  this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.deleted.success', { name: group.name }));
+                  this.reset();
+                } else {
+                  this.notificationsService.error(
+                    this.translateService.get(this.messagePrefix + '.notification.deleted.failure.title', { name: group.name }),
+                    this.translateService.get(this.messagePrefix + '.notification.deleted.failure.content', { cause: rd.errorMessage }));
+                }
+              })
+          }
+        }
+      });
+    })
+  }
+
+  /**
+   * This method will ensure that the page gets reset and that the cache is cleared
+   */
+  reset() {
+    this.groupDataService.getBrowseEndpoint().pipe(take(1)).subscribe((href: string) => {
+      this.requestService.removeByHrefSubstring(href);
+    });
+    this.onCancel();
+  }
+
   /**
    * Cancel the current edit when component is destroyed & unsub all subscriptions
    */
@@ -277,4 +404,58 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.onCancel();
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
+
+  /**
+   * Check if group has a linked object (community or collection linked to a workflow group)
+   * @param group
+   */
+  hasLinkedDSO(group: Group): Observable<boolean> {
+    if (hasValue(group) && hasValue(group._links.object.href)) {
+      return this.getLinkedDSO(group).pipe(
+        map((rd: RemoteData<DSpaceObject>) => {
+          if (hasValue(rd) && hasValue(rd.payload)) {
+            return true;
+          } else {
+            return false
+          }
+        }),
+        catchError(() => observableOf(false)),
+      );
+    }
+  }
+
+  /**
+   * Get group's linked object if it has one (community or collection linked to a workflow group)
+   * @param group
+   */
+  getLinkedDSO(group: Group): Observable<RemoteData<DSpaceObject>> {
+    if (hasValue(group) && hasValue(group._links.object.href)) {
+      if (group.object === undefined) {
+        return this.dSpaceObjectDataService.findByHref(group._links.object.href);
+      }
+      return group.object;
+    }
+  }
+
+  /**
+   * Get the route to the edit roles tab of the group's linked object (community or collection linked to a workflow group) if it has one
+   * @param group
+   */
+  getLinkedEditRolesRoute(group: Group): Observable<string> {
+    if (hasValue(group) && hasValue(group._links.object.href)) {
+      return this.getLinkedDSO(group).pipe(
+        map((rd: RemoteData<DSpaceObject>) => {
+          if (hasValue(rd) && hasValue(rd.payload)) {
+            const dso = rd.payload
+            switch ((dso as any).type) {
+              case Community.type.value:
+                return getCommunityEditRolesRoute(rd.payload.id);
+              case Collection.type.value:
+                return getCollectionEditRolesRoute(rd.payload.id);
+            }
+          }
+        })
+      )
+    }
+  }
 }
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html
index ccbb64d42cc..d24bf35e2a2 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html
@@ -24,7 +24,7 @@ <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | tr
     </div>
   </form>
 
-  <ds-pagination *ngIf="(ePeopleSearch | async)?.payload.totalElements > 0"
+  <ds-pagination *ngIf="(ePeopleSearch | async)?.payload?.totalElements > 0"
                  [paginationOptions]="configSearch"
                  [pageInfoState]="(ePeopleSearch | async)?.payload"
                  [collectionSize]="(ePeopleSearch | async)?.payload?.totalElements"
@@ -70,7 +70,7 @@ <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | tr
 
   </ds-pagination>
 
-  <div *ngIf="(ePeopleSearch | async)?.payload.totalElements == 0 && searchDone"
+  <div *ngIf="(ePeopleSearch | async)?.payload?.totalElements == 0 && searchDone"
        class="alert alert-info w-100 mb-2"
        role="alert">
     {{messagePrefix + '.no-items' | translate}}
@@ -78,7 +78,7 @@ <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | tr
 
   <h4>{{messagePrefix + '.headMembers' | translate}}</h4>
 
-  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.payload.totalElements > 0"
+  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.payload?.totalElements > 0"
                  [paginationOptions]="config"
                  [pageInfoState]="(ePeopleMembersOfGroup | async)?.payload"
                  [collectionSize]="(ePeopleMembersOfGroup | async)?.payload?.totalElements"
@@ -116,7 +116,7 @@ <h4>{{messagePrefix + '.headMembers' | translate}}</h4>
 
   </ds-pagination>
 
-  <div *ngIf="(ePeopleMembersOfGroup | async)?.payload.totalElements == 0" class="alert alert-info w-100 mb-2"
+  <div *ngIf="(ePeopleMembersOfGroup | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2"
        role="alert">
     {{messagePrefix + '.no-members-yet' | translate}}
   </div>
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 7cefda27dc7..e3470d510ae 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -1,6 +1,14 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, fakeAsync, flush, inject, TestBed, tick } from '@angular/core/testing';
+import {
+  async,
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  inject,
+  TestBed,
+  tick
+} from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
@@ -8,7 +16,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { RestResponse } from '../../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../../core/eperson/group-data.service';
@@ -52,13 +60,13 @@ describe('MembersListComponent', () => {
       epersonMembers: epersonMembers,
       subgroupMembers: subgroupMembers,
       findAllByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
-        return createSuccessfulRemoteDataObject$(new PaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()))
+        return createSuccessfulRemoteDataObject$(buildPaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()))
       },
       searchByScope(scope: string, query: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), allEPersons))
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons))
         }
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []))
       },
       clearEPersonRequests() {
         // empty
@@ -83,9 +91,9 @@ describe('MembersListComponent', () => {
       },
       searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), this.allGroups))
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups))
         }
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []))
       },
       addMemberToGroup(parentGroup, eperson: EPerson): Observable<RestResponse> {
         this.epersonMembers = [...this.epersonMembers, eperson];
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
index b2e9ea75d61..c2264b3373b 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -4,14 +4,17 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
-import { RestResponse } from '../../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../../core/eperson/group-data.service';
 import { EPerson } from '../../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../../core/eperson/models/group.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../../core/shared/operators';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
+} from '../../../../../core/shared/operators';
 import { hasValue } from '../../../../../shared/empty.util';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
@@ -160,7 +163,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
             elementsPerPage: Number.MAX_SAFE_INTEGER
           })
             .pipe(
-              getSucceededRemoteData(),
+              getFirstSucceededRemoteData(),
               getRemoteDataPayload(),
               map((listEPeopleInGroup: PaginatedList<EPerson>) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)),
               map((epeople: EPerson[]) => epeople.length > 0))
@@ -225,9 +228,9 @@ export class MembersListComponent implements OnInit, OnDestroy {
    * @param nameObject      Object request was about
    * @param activeGroup     Group currently being edited
    */
-  showNotifications(messageSuffix: string, response: Observable<RestResponse>, nameObject: string, activeGroup: Group) {
-    response.pipe(take(1)).subscribe((restResponse: RestResponse) => {
-      if (restResponse.isSuccessful) {
+  showNotifications(messageSuffix: string, response: Observable<RemoteData<any>>, nameObject: string, activeGroup: Group) {
+    response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<any>) => {
+      if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.success.' + messageSuffix, { name: nameObject }));
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.' + messageSuffix, { name: nameObject }));
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index 9558b9da987..b68038da009 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -18,7 +18,7 @@ <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | tr
     </div>
   </form>
 
-  <ds-pagination *ngIf="(groupsSearch | async)?.payload.totalElements > 0"
+  <ds-pagination *ngIf="(groupsSearch | async)?.payload?.totalElements > 0"
                  [paginationOptions]="configSearch"
                  [pageInfoState]="(groupsSearch | async)?.payload"
                  [collectionSize]="(groupsSearch | async)?.payload?.totalElements"
@@ -65,14 +65,14 @@ <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | tr
     </div>
   </ds-pagination>
 
-  <div *ngIf="(groupsSearch | async)?.payload.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
+  <div *ngIf="(groupsSearch | async)?.payload?.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
        role="alert">
     {{messagePrefix + '.no-items' | translate}}
   </div>
 
   <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
 
-  <ds-pagination *ngIf="(subgroupsOfGroup | async)?.payload.totalElements > 0"
+  <ds-pagination *ngIf="(subgroupsOfGroup | async)?.payload?.totalElements > 0"
                  [paginationOptions]="config"
                  [pageInfoState]="(subgroupsOfGroup | async)?.payload"
                  [collectionSize]="(subgroupsOfGroup | async)?.payload?.totalElements"
@@ -109,7 +109,7 @@ <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
     </div>
   </ds-pagination>
 
-  <div *ngIf="(subgroupsOfGroup | async)?.payload.totalElements == 0" class="alert alert-info w-100 mb-2"
+  <div *ngIf="(subgroupsOfGroup | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2"
        role="alert">
     {{messagePrefix + '.no-subgroups-yet' | translate}}
   </div>
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
index 68942289ffa..1add6e3aa3a 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
@@ -8,7 +8,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { RestResponse } from '../../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { GroupDataService } from '../../../../../core/eperson/group-data.service';
 import { Group } from '../../../../../core/eperson/models/group.model';
@@ -52,16 +52,16 @@ describe('SubgroupsListComponent', () => {
         return this.activeGroup;
       },
       findAllByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
-        return createSuccessfulRemoteDataObject$(new PaginatedList<Group>(new PageInfo(), this.subgroups))
+        return createSuccessfulRemoteDataObject$(buildPaginatedList<Group>(new PageInfo(), this.subgroups))
       },
       getGroupEditPageRouterLink(group: Group): string {
         return '/admin/access-control/groups/' + group.id;
       },
       searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), allGroups))
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allGroups))
         }
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []))
       },
       addSubGroupToGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
         this.subgroups = [...this.subgroups, subgroup];
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
index 62927b74aae..96177c5a11a 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -4,12 +4,15 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
-import { RestResponse } from '../../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { GroupDataService } from '../../../../../core/eperson/group-data.service';
 import { Group } from '../../../../../core/eperson/models/group.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../../core/shared/operators';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
+} from '../../../../../core/shared/operators';
 import { hasValue } from '../../../../../shared/empty.util';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
@@ -125,7 +128,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
               elementsPerPage: Number.MAX_SAFE_INTEGER
             })
               .pipe(
-                getSucceededRemoteData(),
+                getFirstSucceededRemoteData(),
                 getRemoteDataPayload(),
                 map((listTotalGroups: PaginatedList<Group>) => listTotalGroups.page.filter((groupInList: Group) => groupInList.id === possibleSubgroup.id)),
                 map((groups: Group[]) => groups.length > 0))
@@ -231,9 +234,9 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
    * @param nameObject      Object request was about
    * @param activeGroup     Group currently being edited
    */
-  showNotifications(messageSuffix: string, response: Observable<RestResponse>, nameObject: string, activeGroup: Group) {
-    response.pipe(take(1)).subscribe((restResponse: RestResponse) => {
-      if (restResponse.isSuccessful) {
+  showNotifications(messageSuffix: string, response: Observable<RemoteData<Group>>, nameObject: string, activeGroup: Group) {
+    response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<Group>) => {
+      if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.success.' + messageSuffix, { name: nameObject }));
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.' + messageSuffix, { name: nameObject }));
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
index 3bd7d7ac4ff..2b0c35ea83c 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
@@ -30,10 +30,10 @@ <h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
       </form>
 
       <ds-pagination
-        *ngIf="(groups | async)?.payload?.totalElements > 0"
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0"
         [paginationOptions]="config"
-        [pageInfoState]="(groups | async)?.payload"
-        [collectionSize]="(groups | async)?.payload?.totalElements"
+        [pageInfoState]="pageInfoState$"
+        [collectionSize]="(pageInfoState$ | async)?.totalElements"
         [hideGear]="true"
         [hidePagerWhenSinglePage]="true"
         (pageChange)="onPageChange($event)">
@@ -50,21 +50,21 @@ <h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
             </tr>
             </thead>
             <tbody>
-            <tr *ngFor="let group of (groups | async)?.payload?.page">
-              <td>{{group.id}}</td>
-              <td>{{group.name}}</td>
-              <td>{{(getMembers(group) | async)?.payload?.totalElements + (getSubgroups(group) | async)?.payload?.totalElements}}</td>
+            <tr *ngFor="let groupDto of (groupsDto$ | async)?.page">
+              <td>{{groupDto.group.id}}</td>
+              <td>{{groupDto.group.name}}</td>
+              <td>{{(getMembers(groupDto.group) | async)?.payload?.totalElements + (getSubgroups(groupDto.group) | async)?.payload?.totalElements}}</td>
               <!--              <td>{{getOptionalComColFromName(group.name)}}</td>-->
               <td>
                 <div class="btn-group edit-field">
-                  <button [routerLink]="groupService.getGroupEditPageRouterLink(group)"
+                  <button [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
                           class="btn btn-outline-primary btn-sm"
-                          title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: group.name} }}">
+                          title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: groupDto.group.name} }}">
                     <i class="fas fa-edit fa-fw"></i>
                   </button>
-                  <button *ngIf="!group?.permanent" (click)="deleteGroup(group)"
-                          class="btn btn-outline-danger btn-sm"
-                          title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: group.name} }}">
+                  <button *ngIf="!groupDto.group?.permanent && groupDto.ableToDelete"
+                          (click)="deleteGroup(groupDto.group)" class="btn btn-outline-danger btn-sm"
+                          title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: groupDto.group.name} }}">
                     <i class="fas fa-trash-alt fa-fw"></i>
                   </button>
                 </div>
@@ -75,7 +75,7 @@ <h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
         </div>
       </ds-pagination>
 
-      <div *ngIf="(groups | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+      <div *ngIf="(pageInfoState$ | async)?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
         {{messagePrefix + 'no-items' | translate}}
       </div>
 
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
index deca1b951b1..4de9d9e1255 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
@@ -6,14 +6,18 @@ import { BrowserModule, By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable } from 'rxjs/internal/Observable';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { Observable, of as observableOf } from 'rxjs';
+import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { Group } from '../../../core/eperson/models/group.model';
 import { RouteService } from '../../../core/services/route.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
@@ -30,6 +34,8 @@ describe('GroupRegistryComponent', () => {
   let fixture: ComponentFixture<GroupsRegistryComponent>;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
+  let dsoDataServiceStub: any;
+  let authorizationService: AuthorizationDataService;
 
   let mockGroups;
   let mockEPeople;
@@ -41,11 +47,11 @@ describe('GroupRegistryComponent', () => {
       findAllByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         switch (href) {
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/epersons':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: 0, totalPages: 0, currentPage: 1 }), []));
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/epersons':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, [EPersonMock]));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: 1, totalPages: 1, currentPage: 1 }), [EPersonMock]));
           default:
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: 0, totalPages: 0, currentPage: 1 }), []));
         }
       }
     };
@@ -54,11 +60,11 @@ describe('GroupRegistryComponent', () => {
       findAllByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
         switch (href) {
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/groups':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: 0, totalPages: 0, currentPage: 1 }), []));
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/groups':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, [GroupMock2]));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: 1, totalPages: 1, currentPage: 1 }), [GroupMock2]));
           default:
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: 0, totalPages: 0, currentPage: 1 }), []));
         }
       },
       getGroupEditPageRouterLink(group: Group): string {
@@ -69,14 +75,22 @@ describe('GroupRegistryComponent', () => {
       },
       searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allGroups));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: this.allGroups.length, totalElements: this.allGroups.length, totalPages: 1, currentPage: 1 }), this.allGroups));
         }
         const result = this.allGroups.find((group: Group) => {
           return (group.id.includes(query))
         });
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: [result].length, totalElements: [result].length, totalPages: 1, currentPage: 1 }), [result]));
       }
     };
+    dsoDataServiceStub = {
+      findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
+        return createSuccessfulRemoteDataObject$(undefined);
+      }
+    }
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
@@ -90,9 +104,12 @@ describe('GroupRegistryComponent', () => {
       providers: [GroupsRegistryComponent,
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataServiceStub },
+        { provide: DSpaceObjectDataService, useValue: dsoDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: new RouterMock() },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
index 6f606b68018..30a5842a71b 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
@@ -1,19 +1,39 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+  Observable,
+  of as observableOf
+} from 'rxjs';
+import { filter } from 'rxjs/internal/operators/filter';
+import { ObservedValueOf } from 'rxjs/internal/types';
+import { catchError, map, switchMap, take } from 'rxjs/operators';
+import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { GroupDtoModel } from '../../../core/eperson/models/group-dto.model';
 import { Group } from '../../../core/eperson/models/group.model';
 import { RouteService } from '../../../core/services/route.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-groups-registry',
@@ -23,7 +43,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
  * A component used for managing all existing groups within the repository.
  * The admin can create, edit or delete groups here.
  */
-export class GroupsRegistryComponent implements OnInit {
+export class GroupsRegistryComponent implements OnInit, OnDestroy {
 
   messagePrefix = 'admin.access-control.groups.';
 
@@ -37,9 +57,19 @@ export class GroupsRegistryComponent implements OnInit {
   });
 
   /**
-   * A list of all the current groups within the repository or the result of the search
+   * A list of all the current Groups within the repository or the result of the search
    */
-  groups: Observable<RemoteData<PaginatedList<Group>>>;
+  groups$: BehaviorSubject<RemoteData<PaginatedList<Group>>> = new BehaviorSubject<RemoteData<PaginatedList<Group>>>({} as any);
+  /**
+   * A BehaviorSubject with the list of GroupDtoModel objects made from the Groups in the repository or
+   * as the result of the search
+   */
+  groupsDto$: BehaviorSubject<PaginatedList<GroupDtoModel>> = new BehaviorSubject<PaginatedList<GroupDtoModel>>({} as any);
+
+  /**
+   * An observable for the pageInfo, needed to pass to the pagination component
+   */
+  pageInfoState$: BehaviorSubject<PageInfo> = new BehaviorSubject<PageInfo>(undefined);
 
   // The search form
   searchForm;
@@ -47,13 +77,21 @@ export class GroupsRegistryComponent implements OnInit {
   // Current search in groups registry
   currentSearchQuery: string;
 
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
   constructor(public groupService: GroupDataService,
               private ePersonDataService: EPersonDataService,
+              private dSpaceObjectDataService: DSpaceObjectDataService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
               private formBuilder: FormBuilder,
               protected routeService: RouteService,
-              private router: Router) {
+              private router: Router,
+              private authorizationService: AuthorizationDataService,
+              public requestService: RequestService) {
     this.currentSearchQuery = '';
     this.searchForm = this.formBuilder.group(({
       query: this.currentSearchQuery,
@@ -84,37 +122,70 @@ export class GroupsRegistryComponent implements OnInit {
       this.currentSearchQuery = query;
       this.config.currentPage = 1;
     }
-    this.groups = this.groupService.searchGroups(this.currentSearchQuery.trim(), {
+    this.subs.push(this.groupService.searchGroups(this.currentSearchQuery.trim(), {
       currentPage: this.config.currentPage,
       elementsPerPage: this.config.pageSize
-    });
+    }).pipe(getFirstCompletedRemoteData())
+      .subscribe((groupsRD: RemoteData<PaginatedList<Group>>) => {
+        this.groups$.next(groupsRD);
+        this.pageInfoState$.next(groupsRD.payload.pageInfo);
+      }
+    ));
+
+    this.subs.push(this.groups$.pipe(
+      getAllSucceededRemoteDataPayload(),
+      switchMap((groups: PaginatedList<Group>) => {
+        return observableCombineLatest(...groups.page.map((group: Group) => {
+          return observableCombineLatest(
+            this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(group) ? group.self : undefined),
+            this.hasLinkedDSO(group),
+            (isAuthorized: ObservedValueOf<Observable<boolean>>, hasLinkedDSO: ObservedValueOf<Observable<boolean>>) => {
+              const groupDtoModel: GroupDtoModel = new GroupDtoModel();
+              groupDtoModel.ableToDelete = isAuthorized && !hasLinkedDSO;
+              groupDtoModel.group = group;
+              return groupDtoModel;
+            }
+          )
+        })).pipe(map((dtos: GroupDtoModel[]) => {
+          return buildPaginatedList(groups.pageInfo, dtos);
+        }))
+      })).subscribe((value: PaginatedList<GroupDtoModel>) => {
+      this.groupsDto$.next(value);
+      this.pageInfoState$.next(value.pageInfo);
+    }));
   }
 
   /**
    * Delete Group
    */
   deleteGroup(group: Group) {
-    // TODO (backend)
-    console.log('TODO implement editGroup', group);
-    this.notificationsService.error('TODO implement deleteGroup (not yet implemented in backend)');
     if (hasValue(group.id)) {
-      this.groupService.deleteGroup(group).pipe(take(1)).subscribe((success: boolean) => {
-        if (success) {
-          this.notificationsService.success(this.translateService.get(this.messagePrefix + 'notification.deleted.success', { name: group.name }));
-          this.forceUpdateGroup();
-        } else {
-          this.notificationsService.error(this.translateService.get(this.messagePrefix + 'notification.deleted.failure', { name: group.name }));
-        }
-      })
+      this.groupService.delete(group.id).pipe(getFirstCompletedRemoteData())
+        .subscribe((rd: RemoteData<NoContent>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(this.translateService.get(this.messagePrefix + 'notification.deleted.success', { name: group.name }));
+            this.reset();
+          } else {
+            this.notificationsService.error(
+              this.translateService.get(this.messagePrefix + 'notification.deleted.failure.title', { name: group.name }),
+              this.translateService.get(this.messagePrefix + 'notification.deleted.failure.content', { cause: rd.errorMessage }));
+          }
+        })
     }
   }
 
   /**
-   * Force-update the list of groups by first clearing the cache related to groups, then performing a new REST call
+   * This method will ensure that the page gets reset and that the cache is cleared
    */
-  public forceUpdateGroup() {
-    this.groupService.clearGroupsRequests();
-    this.search({ query: this.currentSearchQuery })
+  reset() {
+    this.groupService.getBrowseEndpoint().pipe(
+      switchMap((href) => this.requestService.removeByHrefSubstring(href)),
+      filter((isCached) => isCached),
+      take(1)
+    ).subscribe(() => {
+      this.cleanupSubscribes();
+      this.search({ query: this.currentSearchQuery });
+    });
   }
 
   /**
@@ -133,6 +204,23 @@ export class GroupsRegistryComponent implements OnInit {
     return this.groupService.findAllByHref(group._links.subgroups.href);
   }
 
+  /**
+   * Check if group has a linked object (community or collection linked to a workflow group)
+   * @param group
+   */
+  hasLinkedDSO(group: Group): Observable<boolean> {
+    return this.dSpaceObjectDataService.findByHref(group._links.object.href).pipe(
+      map((rd: RemoteData<DSpaceObject>) => {
+        if (hasValue(rd) && hasValue(rd.payload)) {
+          return true;
+        } else {
+          return false
+        }
+      }),
+      catchError(() => observableOf(false)),
+    );
+  }
+
   /**
    * Reset all input-fields to be empty and search all search
    */
@@ -151,4 +239,15 @@ export class GroupsRegistryComponent implements OnInit {
   getOptionalComColFromName(groupName: string): string {
     return this.groupService.getUUIDFromString(groupName);
   }
+
+  /**
+   * Unsub all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.cleanupSubscribes();
+  }
+
+  cleanupSubscribes() {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
 }
diff --git a/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.html b/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.html
new file mode 100644
index 00000000000..a702a7e6b09
--- /dev/null
+++ b/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.html
@@ -0,0 +1,4 @@
+<div class="container">
+    <h2>{{'admin.curation-tasks.header' |translate }}</h2>
+    <ds-curation-form></ds-curation-form>
+</div>
diff --git a/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts b/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
new file mode 100644
index 00000000000..b84f619ff19
--- /dev/null
+++ b/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
@@ -0,0 +1,28 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdminCurationTasksComponent } from './admin-curation-tasks.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+
+describe('AdminCurationTasksComponent', () => {
+  let comp: AdminCurationTasksComponent;
+  let fixture: ComponentFixture<AdminCurationTasksComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [AdminCurationTasksComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdminCurationTasksComponent);
+    comp = fixture.componentInstance;
+  });
+  describe('init', () => {
+    it('should initialise the comp', () => {
+      expect(comp).toBeDefined();
+      expect(fixture.debugElement.nativeElement.innerHTML).toContain('ds-curation-form');
+    });
+  });
+});
diff --git a/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts b/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts
new file mode 100644
index 00000000000..9a80f341b91
--- /dev/null
+++ b/src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component responsible for rendering the system wide Curation Task UI
+ */
+@Component({
+  selector: 'ds-admin-curation-task',
+  templateUrl: './admin-curation-tasks.component.html',
+})
+export class AdminCurationTasksComponent {
+
+}
diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.html
new file mode 100644
index 00000000000..42a04b0de6b
--- /dev/null
+++ b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -0,0 +1,15 @@
+<div class="container">
+  <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
+  <p>{{'admin.metadata-import.page.help' | translate}}</p>
+
+  <ds-file-dropzone-no-uploader
+    (onFileAdded)="setFile($event)"
+    [dropMessageLabel]="'admin.metadata-import.page.dropMsg'"
+    [dropMessageLabelReplacement]="'admin.metadata-import.page.dropMsgReplace'">
+  </ds-file-dropzone-no-uploader>
+
+  <button class="btn btn-secondary" id="backButton"
+          (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
+  <button class="btn btn-primary" id="proceedButton"
+          (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
+</div>
diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
new file mode 100644
index 00000000000..e6e242755f0
--- /dev/null
+++ b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
@@ -0,0 +1,141 @@
+import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { AuthService } from '../../core/auth/auth.service';
+import {
+  METADATA_IMPORT_SCRIPT_NAME,
+  ScriptDataService
+} from '../../core/data/processes/script-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../shared/utils/require-file.validator';
+import { MetadataImportPageComponent } from './metadata-import-page.component';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+describe('MetadataImportPageComponent', () => {
+  let comp: MetadataImportPageComponent;
+  let fixture: ComponentFixture<MetadataImportPageComponent>;
+
+  let user;
+
+  let notificationService: NotificationsServiceStub;
+  let scriptService: any;
+  let router;
+  let authService;
+  let locationStub;
+
+  function init() {
+    notificationService = new NotificationsServiceStub();
+    scriptService = jasmine.createSpyObj('scriptService',
+      {
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
+      }
+    );
+    user = Object.assign(new EPerson(), {
+      id: 'userId',
+      email: 'user@test.com'
+    });
+    authService = jasmine.createSpyObj('authService', {
+      getAuthenticatedUserFromStore: observableOf(user)
+    });
+    router = jasmine.createSpyObj('router', {
+      navigateByUrl: jasmine.createSpy('navigateByUrl')
+    });
+    locationStub = jasmine.createSpyObj('location', {
+      back: jasmine.createSpy('back')
+    });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [MetadataImportPageComponent, FileValueAccessorDirective, FileValidator],
+      providers: [
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: Router, useValue: router },
+        { provide: AuthService, useValue: authService },
+        { provide: Location, useValue: locationStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetadataImportPageComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  describe('if back button is pressed', () => {
+    beforeEach(fakeAsync(() => {
+      const proceed = fixture.debugElement.query(By.css('#backButton')).nativeElement;
+      proceed.click();
+      fixture.detectChanges();
+    }));
+    it('should do location.back', () => {
+      expect(locationStub.back).toHaveBeenCalled();
+    });
+  });
+
+  describe('if file is set', () => {
+    let fileMock: File;
+
+    beforeEach(() => {
+      fileMock = new File([''], 'filename.txt', { type: 'text/plain' });
+      comp.setFile(fileMock);
+    });
+
+    describe('if proceed button is pressed', () => {
+      beforeEach(fakeAsync(() => {
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('metadata-import script is invoked with its -e currentUserEmail, -f fileName and the mockFile', () => {
+        const parameterValues: ProcessParameter[] = [
+          Object.assign(new ProcessParameter(), { name: '-e', value: user.email }),
+          Object.assign(new ProcessParameter(), { name: '-f', value: 'filename.txt' }),
+        ];
+        expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);
+      });
+      it('success notification is shown', () => {
+        expect(notificationService.success).toHaveBeenCalled();
+      });
+      it('redirected to process page', () => {
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45');
+      });
+    });
+
+    describe('if proceed is pressed; but script invoke fails', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(scriptService, 'invoke').and.returnValue(createFailedRemoteDataObject$('Error', 500));
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('error notification is shown', () => {
+        expect(notificationService.error).toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts
new file mode 100644
index 00000000000..25b060ce813
--- /dev/null
+++ b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts
@@ -0,0 +1,107 @@
+import { Location } from '@angular/common';
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { map, switchMap } from 'rxjs/operators';
+import { AuthService } from '../../core/auth/auth.service';
+import {
+  METADATA_IMPORT_SCRIPT_NAME,
+  ScriptDataService
+} from '../../core/data/processes/script-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { Process } from '../../process-page/processes/process.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+
+@Component({
+  selector: 'ds-metadata-import-page',
+  templateUrl: './metadata-import-page.component.html'
+})
+
+/**
+ * Component that represents a metadata import page for administrators
+ */
+export class MetadataImportPageComponent implements OnInit {
+
+  /**
+   * The current value of the file
+   */
+  fileObject: File;
+
+  /**
+   * The authenticated user's email
+   */
+  private currentUserEmail$: Observable<string>;
+
+  public constructor(protected authService: AuthService,
+                     private location: Location,
+                     protected translate: TranslateService,
+                     protected notificationsService: NotificationsService,
+                     private scriptDataService: ScriptDataService,
+                     private router: Router) {
+  }
+
+  /**
+   * Set file
+   * @param file
+   */
+  setFile(file) {
+    this.fileObject = file;
+  }
+
+  /**
+   * Method provided by Angular. Invoked after the constructor.
+   */
+  ngOnInit() {
+    this.currentUserEmail$ = this.authService.getAuthenticatedUserFromStore().pipe(
+      map((user: EPerson) => user.email)
+    );
+  }
+
+  /**
+   * When return button is pressed go to previous location
+   */
+  public onReturn() {
+    this.location.back();
+  }
+
+  /**
+   * Starts import-metadata script with -e currentUserEmail -f fileName (and the selected file)
+   */
+  public importMetadata() {
+    if (this.fileObject == null) {
+      this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
+    } else {
+      this.currentUserEmail$.pipe(
+        switchMap((email: string) => {
+          if (isNotEmpty(email)) {
+            const parameterValues: ProcessParameter[] = [
+              Object.assign(new ProcessParameter(), { name: '-e', value: email }),
+              Object.assign(new ProcessParameter(), { name: '-f', value: this.fileObject.name }),
+            ];
+            return this.scriptDataService.invoke(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [this.fileObject])
+          }
+        }),
+        getFirstCompletedRemoteData(),
+      ).subscribe((rd: RemoteData<Process>) => {
+        if (rd.hasSucceeded) {
+          const title = this.translate.get('process.new.notification.success.title');
+          const content = this.translate.get('process.new.notification.success.content');
+          this.notificationsService.success(title, content);
+          if (isNotEmpty(rd.payload)) {
+            this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
+          }
+        } else {
+          const title = this.translate.get('process.new.notification.error.title');
+          const content = this.translate.get('process.new.notification.error.content');
+          this.notificationsService.error(title, content);
+        }
+      });
+    }
+  }
+}
diff --git a/src/app/+admin/admin-registries/admin-registries-routing-paths.ts b/src/app/+admin/admin-registries/admin-registries-routing-paths.ts
new file mode 100644
index 00000000000..fa8ee0b209f
--- /dev/null
+++ b/src/app/+admin/admin-registries/admin-registries-routing-paths.ts
@@ -0,0 +1,8 @@
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { getRegistriesModuleRoute } from '../admin-routing-paths';
+
+export const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
+
+export function getBitstreamFormatsModuleRoute() {
+  return new URLCombiner(getRegistriesModuleRoute(), BITSTREAMFORMATS_MODULE_PATH).toString();
+}
diff --git a/src/app/+admin/admin-registries/admin-registries-routing.module.ts b/src/app/+admin/admin-registries/admin-registries-routing.module.ts
index afdc46bf172..d291827b12d 100644
--- a/src/app/+admin/admin-registries/admin-registries-routing.module.ts
+++ b/src/app/+admin/admin-registries/admin-registries-routing.module.ts
@@ -2,28 +2,34 @@ import { MetadataRegistryComponent } from './metadata-registry/metadata-registry
 import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { getRegistriesModulePath } from '../admin-routing.module';
-
-const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
-
-export function getBitstreamFormatsModulePath() {
-  return new URLCombiner(getRegistriesModulePath(), BITSTREAMFORMATS_MODULE_PATH).toString();
-}
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-      {path: 'metadata', component: MetadataRegistryComponent, data: {title: 'admin.registries.metadata.title'}},
       {
-        path: 'metadata/:schemaName',
-        component: MetadataSchemaComponent,
-        data: {title: 'admin.registries.schema.title'}
+        path: 'metadata',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'},
+        children: [
+          {
+            path: '',
+            component: MetadataRegistryComponent
+          },
+          {
+            path: ':schemaName',
+            resolve: { breadcrumb: I18nBreadcrumbResolver },
+            component: MetadataSchemaComponent,
+            data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'}
+          }
+        ]
       },
       {
         path: BITSTREAMFORMATS_MODULE_PATH,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
         loadChildren: './bitstream-formats/bitstream-formats.module#BitstreamFormatsModule',
-        data: {title: 'admin.registries.bitstream-formats.title'}
+        data: {title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats'}
       },
     ])
   ]
diff --git a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts b/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
index 8b33463aa0d..a8b510cca63 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
@@ -6,7 +6,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
@@ -14,6 +13,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../../shared/testing/router.stub';
 import { AddBitstreamFormatComponent } from './add-bitstream-format.component';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 describe('AddBitstreamFormatComponent', () => {
   let comp: AddBitstreamFormatComponent;
@@ -37,7 +37,7 @@ describe('AddBitstreamFormatComponent', () => {
     router = new RouterStub();
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-      createBitstreamFormat: observableOf(new RestResponse(true, 200, 'Success')),
+      createBitstreamFormat: createSuccessfulRemoteDataObject$({}),
       clearBitStreamFormatRequests: observableOf(null)
     });
 
@@ -77,7 +77,7 @@ describe('AddBitstreamFormatComponent', () => {
       router = new RouterStub();
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-        createBitstreamFormat: observableOf(new RestResponse(false, 400, 'Bad Request')),
+        createBitstreamFormat: createFailedRemoteDataObject$('Error', 500),
         clearBitStreamFormatRequests: observableOf(null)
       });
 
diff --git a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts b/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
index 9712be70cad..132343dcf06 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
@@ -1,12 +1,12 @@
-import { take } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { Component } from '@angular/core';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 /**
  * This component renders the page to create a new bitstream format.
@@ -32,12 +32,13 @@ export class AddBitstreamFormatComponent {
    * @param bitstreamFormat
    */
   createBitstreamFormat(bitstreamFormat: BitstreamFormat) {
-    this.bitstreamFormatDataService.createBitstreamFormat(bitstreamFormat).pipe(take(1)
-    ).subscribe((response: RestResponse) => {
-        if (response.isSuccessful) {
+    this.bitstreamFormatDataService.createBitstreamFormat(bitstreamFormat).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((response: RemoteData<BitstreamFormat>) => {
+        if (response.hasSucceeded) {
           this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.create.success.head'),
             this.translateService.get('admin.registries.bitstream-formats.create.success.content'));
-          this.router.navigate([getBitstreamFormatsModulePath()]);
+          this.router.navigate([getBitstreamFormatsModuleRoute()]);
           this.bitstreamFormatDataService.clearBitStreamFormatRequests().subscribe();
         } else {
           this.notificationService.error(this.translateService.get('admin.registries.bitstream-formats.create.failure.head'),
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
index 67f6aa373e5..2f08f8257c4 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
@@ -4,6 +4,7 @@ import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
 const BITSTREAMFORMAT_ADD_PATH = 'add';
@@ -17,14 +18,18 @@ const BITSTREAMFORMAT_ADD_PATH = 'add';
       },
       {
         path: BITSTREAMFORMAT_ADD_PATH,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AddBitstreamFormatComponent,
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'}
       },
       {
         path: BITSTREAMFORMAT_EDIT_PATH,
         component: EditBitstreamFormatComponent,
         resolve: {
-          bitstreamFormat: BitstreamFormatsResolver
-        }
+          bitstreamFormat: BitstreamFormatsResolver,
+          breadcrumb: I18nBreadcrumbResolver
+        },
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'}
       },
     ])
   ],
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
index 2acfa17c8b4..0e426a20e30 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -1,8 +1,6 @@
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -19,6 +17,12 @@ import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 describe('BitstreamFormatsComponent', () => {
   let comp: BitstreamFormatsComponent;
@@ -73,7 +77,7 @@ describe('BitstreamFormatsComponent', () => {
     bitstreamFormat3,
     bitstreamFormat4
   ];
-  const mockFormatsRD = new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFormatsList));
+  const mockFormatsRD = createSuccessfulRemoteDataObject(createPaginatedList(mockFormatsList));
 
   const initAsync = () => {
     notificationsServiceStub = new NotificationsServiceStub();
@@ -82,12 +86,12 @@ describe('BitstreamFormatsComponent', () => {
 
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
       findAll: observableOf(mockFormatsRD),
-      find: observableOf(new RemoteData(false, false, true, undefined, mockFormatsList[0])),
+      find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
       getSelectedBitstreamFormats: hot('a', {a: mockFormatsList}),
       selectBitstreamFormat: {},
       deselectBitstreamFormat: {},
       deselectAllBitstreamFormats: {},
-      delete: observableOf(true),
+      delete: createSuccessfulRemoteDataObject$({}),
       clearBitStreamFormatRequests: observableOf('cleared')
     });
 
@@ -204,12 +208,12 @@ describe('BitstreamFormatsComponent', () => {
 
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
-          find: observableOf(new RemoteData(false, false, true, undefined, mockFormatsList[0])),
+          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
           getSelectedBitstreamFormats: observableOf(mockFormatsList),
           selectBitstreamFormat: {},
           deselectBitstreamFormat: {},
           deselectAllBitstreamFormats: {},
-          delete: observableOf(true),
+          delete: createNoContentRemoteDataObject$(),
           clearBitStreamFormatRequests: observableOf('cleared')
         });
 
@@ -250,7 +254,7 @@ describe('BitstreamFormatsComponent', () => {
 
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
-          find: observableOf(new RemoteData(false, false, true, undefined, mockFormatsList[0])),
+          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
           getSelectedBitstreamFormats: observableOf(mockFormatsList),
           selectBitstreamFormat: {},
           deselectBitstreamFormat: {},
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 52010e0132b..869e57ef898 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
@@ -11,6 +11,7 @@ import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 /**
  * This component renders a list of bitstream formats
@@ -64,7 +65,7 @@ export class BitstreamFormatsComponent implements OnInit {
         const tasks$ = [];
         for (const format of formats) {
           if (hasValue(format.id)) {
-            tasks$.push(this.bitstreamFormatService.delete(format.id));
+            tasks$.push(this.bitstreamFormatService.delete(format.id).pipe(map((response: RemoteData<NoContent>) => response.hasSucceeded)));
           }
         }
         zip(...tasks$).subscribe((results: boolean[]) => {
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
index f6eef741fd3..a00f660baf7 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
-import { find } from 'rxjs/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
-import { hasValue } from '../../../shared/empty.util';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 /**
  * This class represents a resolver that requests a specific bitstreamFormat before the route is activated
@@ -25,7 +24,7 @@ export class BitstreamFormatsResolver implements Resolve<RemoteData<BitstreamFor
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<BitstreamFormat>> {
     return this.bitstreamFormatDataService.findById(route.params.id)
       .pipe(
-        find((RD) => hasValue(RD.error) || RD.hasSucceeded),
+        getFirstCompletedRemoteData()
       );
   }
 }
diff --git a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
index 08770dddf2b..a8bd41d5695 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
@@ -6,7 +6,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
@@ -15,6 +14,11 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../../shared/testing/router.stub';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../../shared/remote-data.utils';
 
 describe('EditBitstreamFormatComponent', () => {
   let comp: EditBitstreamFormatComponent;
@@ -32,7 +36,7 @@ describe('EditBitstreamFormatComponent', () => {
 
   const routeStub = {
     data: observableOf({
-      bitstreamFormat: new RemoteData(false, false, true, null, bitstreamFormat)
+      bitstreamFormat: createSuccessfulRemoteDataObject(bitstreamFormat)
     })
   };
 
@@ -44,7 +48,7 @@ describe('EditBitstreamFormatComponent', () => {
     router =  new RouterStub();
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-      updateBitstreamFormat: observableOf(new RestResponse(true, 200, 'Success'))
+      updateBitstreamFormat: createSuccessfulRemoteDataObject$({})
     });
 
     TestBed.configureTestingModule({
@@ -73,7 +77,8 @@ describe('EditBitstreamFormatComponent', () => {
     it('should initialise the bitstreamFormat based on the route', () => {
 
       comp.bitstreamFormatRD$.subscribe((format: RemoteData<BitstreamFormat>) => {
-        expect(format).toEqual(new RemoteData(false, false, true, null, bitstreamFormat));
+        const expected = createSuccessfulRemoteDataObject(bitstreamFormat);
+        expect(format.payload).toEqual(expected.payload);
       });
     });
   });
@@ -94,7 +99,7 @@ describe('EditBitstreamFormatComponent', () => {
       router =  new RouterStub();
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-        updateBitstreamFormat: observableOf(new RestResponse(false, 400, 'Bad Request'))
+        updateBitstreamFormat: createFailedRemoteDataObject$('Error', 500)
       });
 
       TestBed.configureTestingModule({
diff --git a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
index 0fdcc75689b..14b109fe268 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
@@ -1,14 +1,14 @@
-import { map, take } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 /**
  * This component renders the edit page of a bitstream format.
@@ -46,12 +46,13 @@ export class EditBitstreamFormatComponent implements OnInit {
    * When failed, an error  notification will be shown.
    */
   updateFormat(bitstreamFormat: BitstreamFormat) {
-    this.bitstreamFormatDataService.updateBitstreamFormat(bitstreamFormat).pipe(take(1)
-    ).subscribe((response: RestResponse) => {
-        if (response.isSuccessful) {
+    this.bitstreamFormatDataService.updateBitstreamFormat(bitstreamFormat).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((response: RemoteData<BitstreamFormat>) => {
+        if (response.hasSucceeded) {
           this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.edit.success.head'),
             this.translateService.get('admin.registries.bitstream-formats.edit.success.content'));
-          this.router.navigate([getBitstreamFormatsModulePath()]);
+          this.router.navigate([getBitstreamFormatsModuleRoute()]);
         } else {
           this.notificationService.error('admin.registries.bitstream-formats.edit.failure.head',
             'admin.registries.bitstream-formats.create.edit.content');
diff --git a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 505ccccd91a..7212288ab84 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -12,9 +12,9 @@ import {
   DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
 import { Router } from '@angular/router';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { hasValue, isEmpty } from '../../../../shared/empty.util';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * The component responsible for rendering the form to create/edit a bitstream format
@@ -189,6 +189,6 @@ export class FormatFormComponent implements OnInit {
    * Cancels the edit/create action of the bitstream format and navigates back to the bitstream format registry
    */
   onCancel() {
-    this.router.navigate([getBitstreamFormatsModulePath()]);
+    this.router.navigate([getBitstreamFormatsModuleRoute()]);
   }
 }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index a254f204283..42b75583978 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -11,7 +11,6 @@ <h2 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' |
             <ds-pagination
                     *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
                     [paginationOptions]="config"
-                    [pageInfoState]="(metadataSchemas | async)?.payload"
                     [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
                     [hideGear]="true"
                     [hidePagerWhenSinglePage]="true"
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index bbfd2560363..b0d48d5a103 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -1,7 +1,7 @@
 import { MetadataRegistryComponent } from './metadata-registry.component';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
@@ -45,7 +45,7 @@ describe('MetadataRegistryComponent', () => {
       namespace: 'http://dspace.org/mockschema'
     }
   ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(new PaginatedList(null, mockSchemasList));
+  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* tslint:disable:no-empty */
   const registryServiceStub = {
     getMetadataSchemas: () => mockSchemas,
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 302974b5c2f..1e2e9551b4a 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -2,16 +2,19 @@ import { Component } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map, take } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
-import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Route, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -37,6 +40,11 @@ export class MetadataRegistryComponent {
     pageSize: 25
   });
 
+  /**
+   * Whether or not the list of MetadataSchemas needs an update
+   */
+  needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+
   constructor(private registryService: RegistryService,
               private notificationsService: NotificationsService,
               private router: Router,
@@ -50,14 +58,17 @@ export class MetadataRegistryComponent {
    */
   onPageChange(event) {
     this.config.currentPage = event;
-    this.updateSchemas();
+    this.forceUpdateSchemas();
   }
 
   /**
    * Update the list of schemas by fetching it from the rest api or cache
    */
   private updateSchemas() {
-    this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
+    this.metadataSchemas = this.needsUpdate$.pipe(
+      filter((update) => update === true),
+      switchMap(() => this.registryService.getMetadataSchemas(toFindListOptions(this.config)))
+    );
   }
 
   /**
@@ -65,8 +76,7 @@ export class MetadataRegistryComponent {
    * a new REST call
    */
   public forceUpdateSchemas() {
-    this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.updateSchemas();
+    this.needsUpdate$.next(true);
   }
 
   /**
@@ -125,17 +135,18 @@ export class MetadataRegistryComponent {
    * Delete all the selected metadata schemas
    */
   deleteSchemas() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
       (schemas) => {
         const tasks$ = [];
         for (const schema of schemas) {
           if (hasValue(schema.id)) {
-            tasks$.push(this.registryService.deleteMetadataSchema(schema.id));
+            tasks$.push(this.registryService.deleteMetadataSchema(schema.id).pipe(getFirstCompletedRemoteData()));
           }
         }
-        zip(...tasks$).subscribe((responses: RestResponse[]) => {
-          const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
-          const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
+        zip(...tasks$).subscribe((responses: Array<RemoteData<NoContent>>) => {
+          const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+          const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
           if (successResponses.length > 0) {
             this.showNotification(true, successResponses.length);
           }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
index db2294ab591..a840d68dcf2 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -21,7 +21,8 @@ describe('MetadataSchemaFormComponent', () => {
   const registryServiceStub = {
     getActiveMetadataSchema: () => observableOf(undefined),
     createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
-    cancelEditMetadataSchema: () => {}
+    cancelEditMetadataSchema: () => {},
+    clearMetadataSchemaRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 23e7309a00d..79129d68a41 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -128,6 +128,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created schema using the EventEmitter submitForm
    */
   onSubmit() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
       (schema) => {
         const values = {
@@ -139,7 +140,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
             this.submitForm.emit(newSchema);
           });
         } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), {
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
             id: schema.id,
             prefix: (values.prefix ? values.prefix : schema.prefix),
             namespace: (values.namespace ? values.namespace : schema.namespace)
@@ -148,6 +149,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataSchema();
       }
     );
   }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
index 402f9c0c862..0cb259c6d14 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -27,9 +27,11 @@ describe('MetadataFieldFormComponent', () => {
   /* tslint:disable:no-empty */
   const registryServiceStub = {
     getActiveMetadataField: () => observableOf(undefined),
-    createOrUpdateMetadataField: (field: MetadataField) => observableOf(field),
+    createMetadataField: (field: MetadataField) => observableOf(field),
+    updateMetadataField: (field: MetadataField) => observableOf(field),
     cancelEditMetadataField: () => {},
     cancelEditMetadataSchema: () => {},
+    clearMetadataFieldRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
@@ -74,7 +76,6 @@ describe('MetadataFieldFormComponent', () => {
     const scopeNote = 'fakeScopeNote';
 
     const expected = Object.assign(new MetadataField(), {
-      schema: metadataSchema,
       element: element,
       qualifier: qualifier,
       scopeNote: scopeNote
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 08115303439..70cdc15b4d5 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -153,22 +153,21 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created field using the EventEmitter submitForm
    */
   onSubmit() {
+    this.registryService.clearMetadataFieldRequests().subscribe();
     this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
       (field) => {
         const values = {
-          schema: this.metadataSchema,
           element: this.element.value,
           qualifier: this.qualifier.value,
           scopeNote: this.scopeNote.value
         };
         if (field == null) {
-          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), values)).subscribe((newField) => {
+          this.registryService.createMetadataField(Object.assign(new MetadataField(), values), this.metadataSchema).subscribe((newField) => {
             this.submitForm.emit(newField);
           });
         } else {
-          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), {
+          this.registryService.updateMetadataField(Object.assign(new MetadataField(), field, {
             id: field.id,
-            schema: this.metadataSchema,
             element: (values.element ? values.element : field.element),
             qualifier: (values.qualifier ? values.qualifier : field.qualifier),
             scopeNote: (values.scopeNote ? values.scopeNote : field.scopeNote)
@@ -177,6 +176,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataField();
       }
     );
   }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index 4a7a4cf34dc..49ef7483490 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -1,36 +1,37 @@
 <div class="container">
   <div class="metadata-schema row">
-    <div class="col-12">
+    <div class="col-12" *ngVar="(metadataSchema$ | async) as schema">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{(metadataSchema | async)?.payload?.prefix}}"</h2>
+      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h2>
 
-      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
+      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}</p>
 
       <ds-metadata-field-form
-        [metadataSchema]="(metadataSchema | async)?.payload"
+        [metadataSchema]="schema"
         (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
       <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
 
-      <ds-pagination
-        *ngIf="(metadataFields | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(metadataFields | async)?.payload"
-        [collectionSize]="(metadataFields | async)?.payload?.totalElements"
-        [hideGear]="false"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
-        <div class="table-responsive">
-          <table id="metadata-fields" class="table table-striped table-hover">
-            <thead>
+      <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
+        <ds-pagination
+          *ngIf="fields?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="fields"
+          [collectionSize]="fields?.totalElements"
+          [hideGear]="false"
+          [hidePagerWhenSinglePage]="true"
+          (pageChange)="onPageChange($event)">
+          <div class="table-responsive">
+            <table id="metadata-fields" class="table table-striped table-hover">
+              <thead>
               <tr>
                 <th></th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
               </tr>
-            </thead>
-            <tbody>
-              <tr *ngFor="let field of (metadataFields | async)?.payload?.page"
+              </thead>
+              <tbody>
+              <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
                 <td>
                   <label>
@@ -39,22 +40,23 @@ <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
                            (change)="selectMetadataField(field, $event)">
                   </label>
                 </td>
-                <td class="selectable-row" (click)="editField(field)">{{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
-            </tbody>
-          </table>
-        </div>
-      </ds-pagination>
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
 
-      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{'admin.registries.schema.fields.no-items' | translate}}
-      </div>
+        <div *ngIf="fields?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+          {{'admin.registries.schema.fields.no-items' | translate}}
+        </div>
 
-      <div>
-        <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
-        <button *ngIf="(metadataFields | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
-      </div>
+        <div>
+          <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
+          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+        </div>
+      </ng-container>
 
     </div>
   </div>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index c63bbc6089c..9f14d31aadf 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -1,7 +1,7 @@
 import { MetadataSchemaComponent } from './metadata-schema.component';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -22,6 +22,7 @@ import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -60,7 +61,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'advisor',
       scopeNote: null,
-      schema: mockSchemasList[0]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
     },
     {
       id: 2,
@@ -72,7 +73,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'author',
       scopeNote: null,
-      schema: mockSchemasList[0]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
     },
     {
       id: 3,
@@ -84,7 +85,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'editor',
       scopeNote: 'test scope note',
-      schema: mockSchemasList[1]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
     },
     {
       id: 4,
@@ -96,15 +97,15 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'illustrator',
       scopeNote: null,
-      schema: mockSchemasList[1]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
     }
   ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(new PaginatedList(null, mockSchemasList));
+  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* tslint:disable:no-empty */
   const registryServiceStub = {
     getMetadataSchemas: () => mockSchemas,
-    getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema))),
-    getMetadataSchemaByName: (schemaName: string) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]),
+    getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockFieldsList.filter((value) => value.id === 3 || value.id === 4))),
+    getMetadataSchemaByPrefix: (schemaName: string) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]),
     getActiveMetadataField: () => observableOf(undefined),
     getSelectedMetadataFields: () => observableOf([]),
     editMetadataField: (schema) => {},
@@ -124,7 +125,7 @@ describe('MetadataSchemaComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe],
+      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: ActivatedRoute, useValue: activatedRouteStub },
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 2974c1c0878..6b927b97965 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -3,16 +3,24 @@ import { RegistryService } from '../../../core/registry/registry.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map, take } from 'rxjs/operators';
+import { map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
-import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { combineLatest } from 'rxjs/internal/observable/combineLatest';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-metadata-schema',
@@ -24,21 +32,15 @@ import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
  * The admin can create, edit or delete metadata fields here.
  */
 export class MetadataSchemaComponent implements OnInit {
-
-  /**
-   * The namespace of the metadata schema
-   */
-  namespace;
-
   /**
    * The metadata schema
    */
-  metadataSchema: Observable<RemoteData<MetadataSchema>>;
+  metadataSchema$: Observable<MetadataSchema>;
 
   /**
    * A list of all the fields attached to this metadata schema
    */
-  metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>;
+  metadataFields$: Observable<RemoteData<PaginatedList<MetadataField>>>;
 
   /**
    * Pagination config used to display the list of metadata fields
@@ -49,6 +51,11 @@ export class MetadataSchemaComponent implements OnInit {
     pageSizeOptions: [25, 50, 100, 200]
   });
 
+  /**
+   * Whether or not the list of MetadataFields needs an update
+   */
+  needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+
   constructor(private registryService: RegistryService,
               private route: ActivatedRoute,
               private notificationsService: NotificationsService,
@@ -68,7 +75,7 @@ export class MetadataSchemaComponent implements OnInit {
    * @param params
    */
   initialize(params) {
-    this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName);
+    this.metadataSchema$ = this.registryService.getMetadataSchemaByPrefix(params.schemaName).pipe(getFirstSucceededRemoteDataPayload());
     this.updateFields();
   }
 
@@ -78,18 +85,20 @@ export class MetadataSchemaComponent implements OnInit {
    */
   onPageChange(event) {
     this.config.currentPage = event;
-    this.updateFields();
+    this.forceUpdateFields();
   }
 
   /**
    * Update the list of fields by fetching it from the rest api or cache
    */
   private updateFields() {
-    this.metadataSchema.subscribe((schemaData) => {
-      const schema = schemaData.payload;
-      this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema, this.config);
-      this.namespace = {namespace: schemaData.payload.namespace};
-    });
+    this.metadataFields$ = combineLatest(this.metadataSchema$, this.needsUpdate$).pipe(
+      switchMap(([schema, update]: [MetadataSchema, boolean]) => {
+        if (update) {
+          return this.registryService.getMetadataFieldsBySchema(schema, toFindListOptions(this.config), true, followLink('schema'));
+        }
+      })
+    );
   }
 
   /**
@@ -97,8 +106,7 @@ export class MetadataSchemaComponent implements OnInit {
    * a new REST call
    */
   public forceUpdateFields() {
-    this.registryService.clearMetadataFieldRequests().subscribe();
-    this.updateFields();
+    this.needsUpdate$.next(true);
   }
 
   /**
@@ -157,17 +165,18 @@ export class MetadataSchemaComponent implements OnInit {
    * Delete all the selected metadata fields
    */
   deleteFields() {
+    this.registryService.clearMetadataFieldRequests().subscribe();
     this.registryService.getSelectedMetadataFields().pipe(take(1)).subscribe(
       (fields) => {
         const tasks$ = [];
         for (const field of fields) {
           if (hasValue(field.id)) {
-            tasks$.push(this.registryService.deleteMetadataField(field.id));
+            tasks$.push(this.registryService.deleteMetadataField(field.id).pipe(getFirstCompletedRemoteData()));
           }
         }
-        zip(...tasks$).subscribe((responses: RestResponse[]) => {
-          const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
-          const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
+        zip(...tasks$).subscribe((responses: Array<RemoteData<NoContent>>) => {
+          const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+          const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
           if (successResponses.length > 0) {
             this.showNotification(true, successResponses.length);
           }
diff --git a/src/app/+admin/admin-routing-paths.ts b/src/app/+admin/admin-routing-paths.ts
new file mode 100644
index 00000000000..11eac49fe29
--- /dev/null
+++ b/src/app/+admin/admin-routing-paths.ts
@@ -0,0 +1,13 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { getAdminModuleRoute } from '../app-routing-paths';
+
+export const REGISTRIES_MODULE_PATH = 'registries';
+export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
+
+export function getRegistriesModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), REGISTRIES_MODULE_PATH).toString();
+}
+
+export function getAccessControlModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), ACCESS_CONTROL_MODULE_PATH).toString();
+}
diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index 3d910761b86..7495eab0035 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -1,22 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { getAdminModulePath } from '../app-routing.module';
+import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
 import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
-
-const REGISTRIES_MODULE_PATH = 'registries';
-const ACCESS_CONTROL_MODULE_PATH = 'access-control';
-
-export function getRegistriesModulePath() {
-  return new URLCombiner(getAdminModulePath(), REGISTRIES_MODULE_PATH).toString();
-}
-
-export function getAccessControlModulePath() {
-  return new URLCombiner(getAdminModulePath(), ACCESS_CONTROL_MODULE_PATH).toString();
-}
+import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
+import { ACCESS_CONTROL_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
 
 @NgModule({
   imports: [
@@ -41,6 +31,18 @@ export function getAccessControlModulePath() {
         component: AdminWorkflowPageComponent,
         data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' }
       },
+      {
+        path: 'curation-tasks',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        component: AdminCurationTasksComponent,
+        data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' }
+      },
+      {
+        path: 'metadata-import',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        component: MetadataImportPageComponent,
+        data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' }
+      },
     ])
   ],
   providers: [
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
index 1dcd9780950..8ca02fa8ad9 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
@@ -12,7 +12,8 @@ import { CollectionSearchResult } from '../../../../../shared/object-collection/
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
+import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 
 describe('CollectionAdminSearchResultGridElementComponent', () => {
   let component: CollectionAdminSearchResultGridElementComponent;
@@ -26,6 +27,11 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
     searchResult.indexableObject = new Collection();
     searchResult.indexableObject.uuid = id;
   }
+
+  const linkService = jasmine.createSpyObj('linkService', {
+    resolveLink: {}
+  });
+
   beforeEach(async(() => {
     init();
     TestBed.configureTestingModule({
@@ -39,6 +45,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
         { provide: BitstreamDataService, useValue: {} },
+        { provide: LinkService, useValue: linkService}
       ]
     })
       .compileComponents();
@@ -61,6 +68,6 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
   it('should render an edit button with the correct link', () => {
     const a = fixture.debugElement.query(By.css('a.edit-link'));
     const link = a.nativeElement.href;
-    expect(link).toContain(getCollectionEditPath(id));
+    expect(link).toContain(getCollectionEditRoute(id));
   })
 });
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
index 5e784165abc..9477544f601 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -4,8 +4,8 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { Context } from '../../../../../core/shared/context.model';
 import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
 import { Collection } from '../../../../../core/shared/collection.model';
-import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
 import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
@@ -21,6 +21,6 @@ export class CollectionAdminSearchResultGridElementComponent extends SearchResul
 
   ngOnInit() {
     super.ngOnInit();
-    this.editPath = getCollectionEditPath(this.dso.uuid);
+    this.editPath = getCollectionEditRoute(this.dso.uuid);
   }
 }
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
index 99d33f841a0..6a834dd7537 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
@@ -13,9 +13,9 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
 import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
 import { Community } from '../../../../../core/shared/community.model';
-import { CommunityAdminSearchResultListElementComponent } from '../../admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
+import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 
 describe('CommunityAdminSearchResultGridElementComponent', () => {
   let component: CommunityAdminSearchResultGridElementComponent;
@@ -29,6 +29,11 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
     searchResult.indexableObject = new Community();
     searchResult.indexableObject.uuid = id;
   }
+
+  const linkService = jasmine.createSpyObj('linkService', {
+    resolveLink: {}
+  });
+
   beforeEach(async(() => {
     init();
     TestBed.configureTestingModule({
@@ -42,6 +47,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
         { provide: BitstreamDataService, useValue: {} },
+        { provide: LinkService, useValue: linkService}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     })
@@ -65,6 +71,6 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
   it('should render an edit button with the correct link', () => {
     const a = fixture.debugElement.query(By.css('a.edit-link'));
     const link = a.nativeElement.href;
-    expect(link).toContain(getCommunityEditPath(id));
+    expect(link).toContain(getCommunityEditRoute(id));
   })
 });
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
index 8df12e703f5..59117b1f654 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -4,8 +4,8 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { Context } from '../../../../../core/shared/context.model';
 import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
 import { Community } from '../../../../../core/shared/community.model';
-import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
 import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
@@ -21,6 +21,6 @@ export class CommunityAdminSearchResultGridElementComponent extends SearchResult
 
   ngOnInit() {
     super.ngOnInit();
-    this.editPath = getCommunityEditPath(this.dso.uuid);
+    this.editPath = getCommunityEditRoute(this.dso.uuid);
   }
 }
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
index c571c3d663e..c4b737849b6 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.html
@@ -1,12 +1,7 @@
 <ng-template dsListableObject>
 </ng-template>
-<div #badges class="position-absolute ml-1">
-    <div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
-        <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
-    </div>
-    <div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
-        <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
-    </div>
+<div #badges>
+  <ng-content></ng-content>
 </div>
 <ul #buttons class="list-group list-group-flush">
   <li class="list-group-item">
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
index 69148fb4202..7a69d090f58 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
@@ -1,5 +1,4 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
@@ -13,7 +12,6 @@ import { SharedModule } from '../../../../../shared/shared.module';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
@@ -71,51 +69,4 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-
-  describe('when the item is not withdrawn', () => {
-    beforeEach(() => {
-      component.dso.isWithdrawn = false;
-      fixture.detectChanges();
-    });
-
-    it('should not show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).toBeNull();
-    });
-  });
-
-  describe('when the item is withdrawn', () => {
-    beforeEach(() => {
-      component.dso.isWithdrawn = true;
-      fixture.detectChanges();
-    });
-
-    it('should show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).not.toBeNull();
-    });
-  });
-
-  describe('when the item is not private', () => {
-    beforeEach(() => {
-      component.dso.isDiscoverable = true;
-      fixture.detectChanges();
-    });
-    it('should not show the private badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.private-badge'));
-      expect(badge).toBeNull();
-    });
-  });
-
-  describe('when the item is private', () => {
-    beforeEach(() => {
-      component.dso.isDiscoverable = false;
-      fixture.detectChanges();
-    });
-
-    it('should show the private badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.private-badge'));
-      expect(badge).not.toBeNull();
-    });
-  })
 });
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
index 04558f63200..3fcb33502dd 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
@@ -4,16 +4,6 @@ import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { getListableObjectComponent, listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { Context } from '../../../../../core/shared/context.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { getItemEditPath } from '../../../../../+item-page/item-page-routing.module';
-import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
-import {
-  ITEM_EDIT_DELETE_PATH,
-  ITEM_EDIT_MOVE_PATH,
-  ITEM_EDIT_PRIVATE_PATH,
-  ITEM_EDIT_PUBLIC_PATH,
-  ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
-} from '../../../../../+item-page/edit-item-page/edit-item-page.routing.module';
 import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
index 259d1d64aaa..e4c151eee93 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
@@ -10,7 +10,7 @@ import { CollectionSearchResult } from '../../../../../shared/object-collection/
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
+import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
 
 describe('CollectionAdminSearchResultListElementComponent', () => {
   let component: CollectionAdminSearchResultListElementComponent;
@@ -55,6 +55,6 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
   it('should render an edit button with the correct link', () => {
     const a = fixture.debugElement.query(By.css('a'));
     const link = a.nativeElement.href;
-    expect(link).toContain(getCollectionEditPath(id));
+    expect(link).toContain(getCollectionEditRoute(id));
   })
 });
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
index e49f2721841..9622888660b 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -5,7 +5,7 @@ import { Context } from '../../../../../core/shared/context.model';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
 import { Collection } from '../../../../../core/shared/collection.model';
-import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
+import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
@@ -21,6 +21,6 @@ export class CollectionAdminSearchResultListElementComponent extends SearchResul
 
   ngOnInit() {
     super.ngOnInit();
-    this.editPath = getCollectionEditPath(this.dso.uuid);
+    this.editPath = getCollectionEditRoute(this.dso.uuid);
   }
 }
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
index a7922d7cf57..31709914c5f 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
@@ -9,8 +9,8 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component';
 import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
 import { Community } from '../../../../../core/shared/community.model';
+import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths';
 
 describe('CommunityAdminSearchResultListElementComponent', () => {
   let component: CommunityAdminSearchResultListElementComponent;
@@ -55,6 +55,6 @@ describe('CommunityAdminSearchResultListElementComponent', () => {
   it('should render an edit button with the correct link', () => {
     const a = fixture.debugElement.query(By.css('a'));
     const link = a.nativeElement.href;
-    expect(link).toContain(getCommunityEditPath(id));
+    expect(link).toContain(getCommunityEditRoute(id));
   })
 });
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
index 71fe4203efd..2e82e7f3b8d 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -5,7 +5,7 @@ import { Context } from '../../../../../core/shared/context.model';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
 import { Community } from '../../../../../core/shared/community.model';
-import { getCommunityEditPath } from '../../../../../+community-page/community-page-routing.module';
+import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
@@ -21,6 +21,6 @@ export class CommunityAdminSearchResultListElementComponent extends SearchResult
 
   ngOnInit() {
     super.ngOnInit();
-    this.editPath = getCommunityEditPath(this.dso.uuid);
+    this.editPath = getCommunityEditRoute(this.dso.uuid);
   }
 }
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
index a74e339e631..259512552c8 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -1,12 +1,7 @@
-<div *ngIf="dso && !dso.isDiscoverable" class="private-badge">
-    <span class="badge badge-danger">{{ "admin.search.item.private" | translate }}</span>
-</div>
-<div *ngIf="dso && dso.isWithdrawn" class="withdrawn-badge">
-    <span class="badge badge-warning">{{ "admin.search.item.withdrawn" | translate }}</span>
-</div>
 <ds-listable-object-component-loader [object]="object"
                                      [viewMode]="viewModes.ListElement"
                                      [index]="index"
                                      [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
+                                     [listID]="listID"
+                                     [hideBadges]="true"></ds-listable-object-component-loader>
 <ds-item-admin-search-result-actions-element [item]="dso" [small]="false"></ds-item-admin-search-result-actions-element>
diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
index 8395bd4f114..f1decc9ed81 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
@@ -1,11 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
@@ -51,51 +49,4 @@ describe('ItemAdminSearchResultListElementComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-
-  describe('when the item is not withdrawn', () => {
-    beforeEach(() => {
-      component.dso.isWithdrawn = false;
-      fixture.detectChanges();
-    });
-
-    it('should not show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).toBeNull();
-    });
-  });
-
-  describe('when the item is withdrawn', () => {
-    beforeEach(() => {
-      component.dso.isWithdrawn = true;
-      fixture.detectChanges();
-    });
-
-    it('should show the withdrawn badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-      expect(badge).not.toBeNull();
-    });
-  });
-
-  describe('when the item is not private', () => {
-    beforeEach(() => {
-      component.dso.isDiscoverable = true;
-      fixture.detectChanges();
-    });
-    it('should not show the private badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.private-badge'));
-      expect(badge).toBeNull();
-    });
-  });
-
-  describe('when the item is private', () => {
-    beforeEach(() => {
-      component.dso.isDiscoverable = false;
-      fixture.detectChanges();
-    });
-
-    it('should show the private badge', () => {
-      const badge = fixture.debugElement.query(By.css('div.private-badge'));
-      expect(badge).not.toBeNull();
-    });
-  })
 });
diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
index a4a923e725b..2ee828e870a 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
@@ -1,27 +1,27 @@
-<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 edit-link" [routerLink]="[getEditPath()]" [title]="'admin.search.item.edit' | translate">
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 edit-link" [routerLink]="[getEditRoute()]" [title]="'admin.search.item.edit' | translate">
     <i class="fa fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
 </a>
 
-<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawPath()]" [title]="'admin.search.item.withdraw' | translate">
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isWithdrawn" class="btn btn-light my-1 withdraw-link" [routerLink]="[getWithdrawRoute()]" [title]="'admin.search.item.withdraw' | translate">
     <i class="fa fa-ban"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
 </a>
 
-<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstatePath()]" [title]="'admin.search.item.reinstate' | translate">
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isWithdrawn" class="btn btn-light my-1 reinstate-link" [routerLink]="[getReinstateRoute()]" [title]="'admin.search.item.reinstate' | translate">
     <i class="fa fa-undo"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
 </a>
 
-<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivatePath()]" [title]="'admin.search.item.make-private' | translate">
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isDiscoverable" class="btn btn-light my-1 private-link" [routerLink]="[getPrivateRoute()]" [title]="'admin.search.item.make-private' | translate">
     <i class="fa fa-eye-slash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
 </a>
 
-<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isDiscoverable" class="btn btn-light my-1 public-link" [routerLink]="[getPublicPath()]" [title]="'admin.search.item.make-public' | translate">
+<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isDiscoverable" class="btn btn-light my-1 public-link" [routerLink]="[getPublicRoute()]" [title]="'admin.search.item.make-public' | translate">
     <i class="fa fa-eye"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
 </a>
 
-<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.search.item.delete' | translate">
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.search.item.delete' | translate">
     <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
 </a>
 
-<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 move-link" [routerLink]="[getMovePath()]" [title]="'admin.search.item.move' | translate">
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 move-link" [routerLink]="[getMoveRoute()]" [title]="'admin.search.item.move' | translate">
     <i class="fa fa-arrow-circle-right"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
 </a>
diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
index c1aceb477d4..f26fde13113 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
@@ -6,16 +6,16 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component';
 import { Item } from '../../../core/shared/item.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { getItemEditRoute } from '../../../+item-page/item-page-routing-paths';
 import {
-  ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
-  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_REINSTATE_PATH,
   ITEM_EDIT_WITHDRAW_PATH
-} from '../../../+item-page/edit-item-page/edit-item-page.routing.module';
-import { getItemEditPath } from '../../../+item-page/item-page-routing.module';
-import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+} from '../../../+item-page/edit-item-page/edit-item-page.routing-paths';
 
 describe('ItemAdminSearchResultActionsComponent', () => {
   let component: ItemAdminSearchResultActionsComponent;
@@ -55,19 +55,19 @@ describe('ItemAdminSearchResultActionsComponent', () => {
   it('should render an edit button with the correct link', () => {
     const button = fixture.debugElement.query(By.css('a.edit-link'));
     const link = button.nativeElement.href;
-    expect(link).toContain(getItemEditPath(id));
+    expect(link).toContain(getItemEditRoute(id));
   });
 
   it('should render a delete button with the correct link', () => {
     const button = fixture.debugElement.query(By.css('a.delete-link'));
     const link = button.nativeElement.href;
-    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_DELETE_PATH).toString());
+    expect(link).toContain(new URLCombiner(getItemEditRoute(id), ITEM_EDIT_DELETE_PATH).toString());
   });
 
   it('should render a move button with the correct link', () => {
     const a = fixture.debugElement.query(By.css('a.move-link'));
     const link = a.nativeElement.href;
-    expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_MOVE_PATH).toString());
+    expect(link).toContain(new URLCombiner(getItemEditRoute(id), ITEM_EDIT_MOVE_PATH).toString());
   });
 
   describe('when the item is not withdrawn', () => {
@@ -79,7 +79,7 @@ describe('ItemAdminSearchResultActionsComponent', () => {
     it('should render a withdraw button with the correct link', () => {
       const a = fixture.debugElement.query(By.css('a.withdraw-link'));
       const link = a.nativeElement.href;
-      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_WITHDRAW_PATH).toString());
+      expect(link).toContain(new URLCombiner(getItemEditRoute(id), ITEM_EDIT_WITHDRAW_PATH).toString());
     });
 
     it('should not render a reinstate button with the correct link', () => {
@@ -102,7 +102,7 @@ describe('ItemAdminSearchResultActionsComponent', () => {
     it('should render a reinstate button with the correct link', () => {
       const a = fixture.debugElement.query(By.css('a.reinstate-link'));
       const link = a.nativeElement.href;
-      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_REINSTATE_PATH).toString());
+      expect(link).toContain(new URLCombiner(getItemEditRoute(id), ITEM_EDIT_REINSTATE_PATH).toString());
     });
   });
 
@@ -115,7 +115,7 @@ describe('ItemAdminSearchResultActionsComponent', () => {
     it('should render a make private button with the correct link', () => {
       const a = fixture.debugElement.query(By.css('a.private-link'));
       const link = a.nativeElement.href;
-      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_PRIVATE_PATH).toString());
+      expect(link).toContain(new URLCombiner(getItemEditRoute(id), ITEM_EDIT_PRIVATE_PATH).toString());
     });
 
     it('should not render a make public button with the correct link', () => {
@@ -138,7 +138,7 @@ describe('ItemAdminSearchResultActionsComponent', () => {
     it('should render a make private button with the correct link', () => {
       const a = fixture.debugElement.query(By.css('a.public-link'));
       const link = a.nativeElement.href;
-      expect(link).toContain(new URLCombiner(getItemEditPath(id), ITEM_EDIT_PUBLIC_PATH).toString());
+      expect(link).toContain(new URLCombiner(getItemEditRoute(id), ITEM_EDIT_PUBLIC_PATH).toString());
     });
   })
 });
diff --git a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index 40cddc816de..d3cbc025c21 100644
--- a/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
+++ b/src/app/+admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -1,15 +1,15 @@
 import { Component, Input } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
-import { getItemEditPath } from '../../../+item-page/item-page-routing.module';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { getItemEditRoute } from '../../../+item-page/item-page-routing-paths';
 import {
-  ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
-  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_REINSTATE_PATH,
   ITEM_EDIT_WITHDRAW_PATH
-} from '../../../+item-page/edit-item-page/edit-item-page.routing.module';
+} from '../../../+item-page/edit-item-page/edit-item-page.routing-paths';
 
 @Component({
   selector: 'ds-item-admin-search-result-actions-element',
@@ -33,49 +33,49 @@ export class ItemAdminSearchResultActionsComponent {
   /**
    * Returns the path to the edit page of this item
    */
-  getEditPath(): string {
-    return getItemEditPath(this.item.uuid)
+  getEditRoute(): string {
+    return getItemEditRoute(this.item.uuid)
   }
 
   /**
    * Returns the path to the move page of this item
    */
-  getMovePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_MOVE_PATH).toString();
+  getMoveRoute(): string {
+    return new URLCombiner(this.getEditRoute(), ITEM_EDIT_MOVE_PATH).toString();
   }
 
   /**
    * Returns the path to the delete page of this item
    */
-  getDeletePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_DELETE_PATH).toString();
+  getDeleteRoute(): string {
+    return new URLCombiner(this.getEditRoute(), ITEM_EDIT_DELETE_PATH).toString();
   }
 
   /**
    * Returns the path to the withdraw page of this item
    */
-  getWithdrawPath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_WITHDRAW_PATH).toString();
+  getWithdrawRoute(): string {
+    return new URLCombiner(this.getEditRoute(), ITEM_EDIT_WITHDRAW_PATH).toString();
   }
 
   /**
    * Returns the path to the reinstate page of this item
    */
-  getReinstatePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_REINSTATE_PATH).toString();
+  getReinstateRoute(): string {
+    return new URLCombiner(this.getEditRoute(), ITEM_EDIT_REINSTATE_PATH).toString();
   }
 
   /**
    * Returns the path to the page where the user can make this item private
    */
-  getPrivatePath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PRIVATE_PATH).toString();
+  getPrivateRoute(): string {
+    return new URLCombiner(this.getEditRoute(), ITEM_EDIT_PRIVATE_PATH).toString();
   }
 
   /**
    * Returns the path to the page where the user can make this item public
    */
-  getPublicPath(): string {
-    return new URLCombiner(this.getEditPath(), ITEM_EDIT_PUBLIC_PATH).toString();
+  getPublicRoute(): string {
+    return new URLCombiner(this.getEditRoute(), ITEM_EDIT_PUBLIC_PATH).toString();
   }
 }
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index e72a17aac1e..eb06df3630e 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -5,7 +5,7 @@
     <div class="sidebar-collapsible">
             <span class="section-header-text">
         <ng-container
-                *ngComponentOutlet="itemComponents.get(section.id); injector: itemInjectors.get(section.id);"></ng-container>
+                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
             </span>
     </div>
-</li>
\ No newline at end of file
+</li>
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.html b/src/app/+admin/admin-sidebar/admin-sidebar.component.html
index 02a25a8227e..357ed058d14 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.html
@@ -25,7 +25,7 @@ <h4 class="section-header-text mb-0">{{'menu.header.admin' |
 
             <ng-container *ngFor="let section of (sections | async)">
                 <ng-container
-                        *ngComponentOutlet="sectionComponents.get(section.id); injector: sectionInjectors.get(section.id);"></ng-container>
+                        *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
             </ng-container>
         </ul>
     </div>
@@ -49,4 +49,4 @@ <h4 class="section-header-text mb-0">{{'menu.header.admin' |
             </div>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts
index 581d3341da5..9cdcccba283 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts
@@ -2,6 +2,7 @@ import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
 import { AdminSidebarComponent } from './admin-sidebar.component';
 import { MenuService } from '../../shared/menu/menu.service';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
@@ -9,28 +10,40 @@ import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service
 import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
 import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { AuthService } from '../../core/auth/auth.service';
-
 import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ActivatedRoute } from '@angular/router';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 
 describe('AdminSidebarComponent', () => {
   let comp: AdminSidebarComponent;
   let fixture: ComponentFixture<AdminSidebarComponent>;
   const menuService = new MenuServiceStub();
+  let authorizationService: AuthorizationDataService;
+  let scriptService;
 
   beforeEach(async(() => {
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    scriptService = jasmine.createSpyObj('scriptService', { scriptWithNameExistsAndCanExecute: observableOf(true) });
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule],
+      imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
       declarations: [AdminSidebarComponent],
       providers: [
         { provide: Injector, useValue: {} },
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
         { provide: AuthService, useClass: AuthServiceStub },
+        { provide: ActivatedRoute, useValue: {} },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: ScriptDataService, useValue: scriptService },
         {
           provide: NgbModal, useValue: {
-            open: () => {/*comment*/}
+            open: () => {/*comment*/
+            }
           }
         }
       ],
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
index 5d885b918b0..3bfbf2de5b9 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,9 +1,14 @@
 import { Component, Injector, OnInit } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { combineLatest as combineLatestObservable } from 'rxjs';
+import { combineLatest as observableCombineLatest } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
-import { first, map } from 'rxjs/operators';
+import { first, map, take } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
+import {
+  METADATA_EXPORT_SCRIPT_NAME,
+  METADATA_IMPORT_SCRIPT_NAME,
+  ScriptDataService
+} from '../../core/data/processes/script-data.service';
 import { slideHorizontal, slideSidebar } from '../../shared/animations/slide';
 import { CreateCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
 import { CreateCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
@@ -11,6 +16,9 @@ import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/mod
 import { EditCollectionSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
 import { EditCommunitySelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
 import { EditItemSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+import {
+  ExportMetadataSelectorComponent
+} from '../../shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
 import { MenuID, MenuItemType } from '../../shared/menu/initial-menus-state';
 import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
 import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick.model';
@@ -18,6 +26,8 @@ import { TextMenuItemModel } from '../../shared/menu/menu-item/models/text.model
 import { MenuComponent } from '../../shared/menu/menu.component';
 import { MenuService } from '../../shared/menu/menu.service';
 import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 /**
  * Component representing the admin sidebar
@@ -61,7 +71,9 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
               protected injector: Injector,
               private variableService: CSSVariableService,
               private authService: AuthService,
-              private modalService: NgbModal
+              private modalService: NgbModal,
+              private authorizationService: AuthorizationDataService,
+              private scriptDataService: ScriptDataService,
   ) {
     super(menuService, injector);
   }
@@ -71,6 +83,9 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   ngOnInit(): void {
     this.createMenu();
+    this.createSiteAdministratorMenuSections();
+    this.createExportMenuSections();
+    this.createImportMenuSections();
     super.ngOnInit();
     this.sidebarWidth = this.variableService.getVariable('sidebarItemsWidth');
     this.authService.isAuthenticated()
@@ -84,7 +99,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         this.sidebarOpen = !collapsed;
         this.sidebarClosed = collapsed;
       });
-    this.sidebarExpanded = combineLatestObservable(this.menuCollapsed, this.menuPreviewCollapsed)
+    this.sidebarExpanded = observableCombineLatest(this.menuCollapsed, this.menuPreviewCollapsed)
       .pipe(
         map(([collapsed, previewCollapsed]) => (!collapsed || !previewCollapsed))
       );
@@ -93,7 +108,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
    * Initialize all menu sections and items for this menu
    */
-  private createMenu() {
+  createMenu() {
     const menuList = [
       /* News */
       {
@@ -145,11 +160,17 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
             this.modalService.open(CreateItemParentSelectorComponent);
           }
         } as OnClickMenuItemModel,
-        // model: {
-        //   type: MenuItemType.LINK,
-        //   text: 'menu.section.new_item',
-        //   link: '/submit'
-        // } as LinkMenuItemModel,
+      },
+      {
+        id: 'new_process',
+        parentID: 'new',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.LINK,
+          text: 'menu.section.new_process',
+          link: '/processes/new'
+        } as LinkMenuItemModel,
       },
       {
         id: 'new_item_version',
@@ -215,40 +236,73 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         } as OnClickMenuItemModel,
       },
 
-      /* Import */
+      /* Curation tasks */
       {
-        id: 'import',
+        id: 'curation_tasks',
         active: false,
         visible: true,
         model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.import'
-        } as TextMenuItemModel,
-        icon: 'sign-in-alt',
-        index: 2
+          type: MenuItemType.LINK,
+          text: 'menu.section.curation_task',
+          link: ''
+        } as LinkMenuItemModel,
+        icon: 'filter',
+        index: 7
       },
+
+      /* Statistics */
       {
-        id: 'import_metadata',
-        parentID: 'import',
+        id: 'statistics_task',
         active: false,
         visible: true,
         model: {
           type: MenuItemType.LINK,
-          text: 'menu.section.import_metadata',
+          text: 'menu.section.statistics_task',
           link: ''
         } as LinkMenuItemModel,
+        icon: 'chart-bar',
+        index: 8
       },
+
+      /* Control Panel */
       {
-        id: 'import_batch',
-        parentID: 'import',
+        id: 'control_panel',
         active: false,
         visible: true,
         model: {
           type: MenuItemType.LINK,
-          text: 'menu.section.import_batch',
+          text: 'menu.section.control_panel',
           link: ''
         } as LinkMenuItemModel,
+        icon: 'cogs',
+        index: 9
+      },
+
+      /* Processes */
+      {
+        id: 'processes',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.LINK,
+          text: 'menu.section.processes',
+          link: '/processes'
+        } as LinkMenuItemModel,
+        icon: 'terminal',
+        index: 10
       },
+    ];
+    menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, Object.assign(menuSection, {
+      shouldPersistOnRouteChange: true
+    })));
+  }
+
+  /**
+   * Create menu sections dependent on whether or not the current user is a site administrator and on whether or not
+   * the export scripts exist and the current user is allowed to execute them
+   */
+  createExportMenuSections() {
+    const menuList = [
       /* Export */
       {
         id: 'export',
@@ -259,7 +313,8 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
           text: 'menu.section.export'
         } as TextMenuItemModel,
         icon: 'sign-out-alt',
-        index: 3
+        index: 3,
+        shouldPersistOnRouteChange: true
       },
       {
         id: 'export_community',
@@ -271,6 +326,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
           text: 'menu.section.export_community',
           link: ''
         } as LinkMenuItemModel,
+        shouldPersistOnRouteChange: true
       },
       {
         id: 'export_collection',
@@ -282,6 +338,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
           text: 'menu.section.export_collection',
           link: ''
         } as LinkMenuItemModel,
+        shouldPersistOnRouteChange: true
       },
       {
         id: 'export_item',
@@ -293,168 +350,225 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
           text: 'menu.section.export_item',
           link: ''
         } as LinkMenuItemModel,
-      }, {
+        shouldPersistOnRouteChange: true
+      },
+    ];
+    menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, menuSection));
+
+    observableCombineLatest(
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      // this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)
+    ).pipe(
+      // TODO uncomment when #635 (https://github.com/DSpace/dspace-angular/issues/635) is fixed; otherwise even in production mode, the metadata export button is only available after a refresh (and not in dev mode)
+      // filter(([authorized, metadataExportScriptExists]: boolean[]) => authorized && metadataExportScriptExists),
+      take(1)
+    ).subscribe(() => {
+      this.menuService.addSection(this.menuID, {
         id: 'export_metadata',
         parentID: 'export',
-        active: false,
+        active: true,
         visible: true,
         model: {
-          type: MenuItemType.LINK,
+          type: MenuItemType.ONCLICK,
           text: 'menu.section.export_metadata',
-          link: ''
-        } as LinkMenuItemModel,
-      },
+          function: () => {
+            this.modalService.open(ExportMetadataSelectorComponent);
+          }
+        } as OnClickMenuItemModel,
+        shouldPersistOnRouteChange: true
+      });
+    });
+  }
 
-      /* Access Control */
+  /**
+   * Create menu sections dependent on whether or not the current user is a site administrator and on whether or not
+   * the import scripts exist and the current user is allowed to execute them
+   */
+  createImportMenuSections() {
+    const menuList = [
+      /* Import */
       {
-        id: 'access_control',
+        id: 'import',
         active: false,
         visible: true,
         model: {
           type: MenuItemType.TEXT,
-          text: 'menu.section.access_control'
+          text: 'menu.section.import'
         } as TextMenuItemModel,
-        icon: 'key',
-        index: 4
-      },
-      {
-        id: 'access_control_people',
-        parentID: 'access_control',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.access_control_people',
-          link: '/admin/access-control/epeople'
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'access_control_groups',
-        parentID: 'access_control',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.access_control_groups',
-          link: '/admin/access-control/groups'
-        } as LinkMenuItemModel,
+        icon: 'sign-in-alt',
+        index: 2
       },
       {
-        id: 'access_control_authorizations',
-        parentID: 'access_control',
+        id: 'import_batch',
+        parentID: 'import',
         active: false,
         visible: true,
         model: {
           type: MenuItemType.LINK,
-          text: 'menu.section.access_control_authorizations',
+          text: 'menu.section.import_batch',
           link: ''
         } as LinkMenuItemModel,
-      },
-      /*  Admin Search */
-      {
-        id: 'admin_search',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.admin_search',
-          link: '/admin/search'
-        } as LinkMenuItemModel,
-        icon: 'search',
-        index: 5
-      },
-      /*  Registries */
-      {
-        id: 'registries',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.registries'
-        } as TextMenuItemModel,
-        icon: 'list',
-        index: 6
-      },
-      {
-        id: 'registries_metadata',
-        parentID: 'registries',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.registries_metadata',
-          link: 'admin/registries/metadata'
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'registries_format',
-        parentID: 'registries',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.registries_format',
-          link: 'admin/registries/bitstream-formats'
-        } as LinkMenuItemModel,
-      },
+      }
+    ];
+    menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, Object.assign(menuSection, {
+      shouldPersistOnRouteChange: true
+    })));
 
-      /* Curation tasks */
-      {
-        id: 'curation_tasks',
-        active: false,
+    observableCombineLatest(
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      // this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)
+    ).pipe(
+      // TODO uncomment when #635 (https://github.com/DSpace/dspace-angular/issues/635) is fixed
+      // filter(([authorized, metadataImportScriptExists]: boolean[]) => authorized && metadataImportScriptExists),
+      take(1)
+    ).subscribe(() => {
+      this.menuService.addSection(this.menuID, {
+        id: 'import_metadata',
+        parentID: 'import',
+        active: true,
         visible: true,
         model: {
           type: MenuItemType.LINK,
-          text: 'menu.section.curation_task',
-          link: ''
+          text: 'menu.section.import_metadata',
+          link: '/admin/metadata-import'
         } as LinkMenuItemModel,
-        icon: 'filter',
-        index: 7
-      },
+        shouldPersistOnRouteChange: true
+      });
+    });
+  }
 
-      /* Statistics */
-      {
-        id: 'statistics_task',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.statistics_task',
-          link: ''
-        } as LinkMenuItemModel,
-        icon: 'chart-bar',
-        index: 8
-      },
+  /**
+   * Create menu sections dependent on whether or not the current user is a site administrator
+   */
+  createSiteAdministratorMenuSections() {
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).subscribe((authorized) => {
+      const menuList = [
+        /* Access Control */
+        {
+          id: 'access_control',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.access_control'
+          } as TextMenuItemModel,
+          icon: 'key',
+          index: 4
+        },
+        {
+          id: 'access_control_people',
+          parentID: 'access_control',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.access_control_people',
+            link: '/admin/access-control/epeople'
+          } as LinkMenuItemModel,
+        },
+        {
+          id: 'access_control_groups',
+          parentID: 'access_control',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.access_control_groups',
+            link: '/admin/access-control/groups'
+          } as LinkMenuItemModel,
+        },
+        {
+          id: 'access_control_authorizations',
+          parentID: 'access_control',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.access_control_authorizations',
+            link: ''
+          } as LinkMenuItemModel,
+        },
+        /*  Admin Search */
+        {
+          id: 'admin_search',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.admin_search',
+            link: '/admin/search'
+          } as LinkMenuItemModel,
+          icon: 'search',
+          index: 5
+        },
+        /*  Registries */
+        {
+          id: 'registries',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.registries'
+          } as TextMenuItemModel,
+          icon: 'list',
+          index: 6
+        },
+        {
+          id: 'registries_metadata',
+          parentID: 'registries',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.registries_metadata',
+            link: 'admin/registries/metadata'
+          } as LinkMenuItemModel,
+        },
+        {
+          id: 'registries_format',
+          parentID: 'registries',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.registries_format',
+            link: 'admin/registries/bitstream-formats'
+          } as LinkMenuItemModel,
+        },
 
-      /* Control Panel */
-      {
-        id: 'control_panel',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.control_panel',
-          link: ''
-        } as LinkMenuItemModel,
-        icon: 'cogs',
-        index: 9
-      },
-      /* Workflow */
-      {
-        id: 'workflow',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.workflow',
-          link: '/admin/workflow'
-        } as LinkMenuItemModel,
-        icon: 'user-check',
-        index: 10
-      },
-    ];
-    menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, menuSection));
+        /* Curation tasks */
+        {
+          id: 'curation_tasks',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.curation_task',
+            link: 'admin/curation-tasks'
+          } as LinkMenuItemModel,
+          icon: 'filter',
+          index: 7
+        },
+
+        /* Workflow */
+        {
+          id: 'workflow',
+          active: false,
+          visible: authorized,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.workflow',
+            link: '/admin/workflow'
+          } as LinkMenuItemModel,
+          icon: 'user-check',
+          index: 11
+        },
+      ];
 
+      menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, Object.assign(menuSection, {
+        shouldPersistOnRouteChange: true
+      })));
+    });
   }
 
   /**
diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 808683910e1..d9869ddf1f1 100644
--- a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -12,16 +12,16 @@
            (click)="toggleSection($event)">
             <span class="section-header-text">
                 <ng-container
-                        *ngComponentOutlet="itemComponents.get(section.id); injector: itemInjectors.get(section.id);"></ng-container>
+                        *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
             </span>
             <i class="fas fa-chevron-right fa-pull-right"
                [@rotate]="(expanded | async) ? 'expanded' : 'collapsed'" [title]="('menu.section.toggle.' + section.id) | translate"></i>
         </a>
         <ul class="sidebar-sub-level-items list-unstyled" @slide *ngIf="(expanded | async)">
-            <li *ngFor="let subSection of (subSections | async)">
+            <li *ngFor="let subSection of (subSections$ | async)">
                 <ng-container
-                        *ngComponentOutlet="itemComponents.get(subSection.id); injector: itemInjectors.get(subSection.id);"></ng-container>
+                        *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
             </li>
         </ul>
     </div>
-</li>
\ No newline at end of file
+</li>
diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
index 37fe15bd406..1f6e2886084 100644
--- a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
+++ b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
@@ -1,4 +1,4 @@
-::ng-deep {
+:host ::ng-deep {
     .fa-chevron-right {
         padding-left: $spacer/2;
         font-size: 0.5rem;
@@ -16,4 +16,4 @@
         display: flex;
         flex-direction: column;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts
index 2f3f88fa701..bb5abb15d60 100644
--- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts
+++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts
@@ -12,12 +12,13 @@ import { WorkflowItem } from '../../../../../core/submission/models/workflowitem
 import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 import { Item } from '../../../../../core/shared/item.model';
-import { PublicationGridElementComponent } from '../../../../../shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component';
+import { ItemGridElementComponent } from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
 import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
 import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { of as observableOf } from 'rxjs';
 
 describe('WorkflowItemAdminWorkflowGridElementComponent', () => {
   let component: WorkflowItemSearchResultAdminWorkflowGridElementComponent;
@@ -42,7 +43,7 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => {
     init();
     TestBed.configureTestingModule(
       {
-        declarations: [WorkflowItemSearchResultAdminWorkflowGridElementComponent, PublicationGridElementComponent, ListableObjectDirective],
+        declarations: [WorkflowItemSearchResultAdminWorkflowGridElementComponent, ItemGridElementComponent, ListableObjectDirective],
         imports: [
           NoopAnimationsModule,
           TranslateModule.forRoot(),
@@ -50,14 +51,16 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => {
         ],
         providers: [
           { provide: LinkService, useValue: linkService },
-          { provide: TruncatableService, useValue: {} },
+          { provide: TruncatableService, useValue: {
+              isCollapsed: () => observableOf(true),
+            } },
           { provide: BitstreamDataService, useValue: {} },
         ],
         schemas: [NO_ERRORS_SCHEMA]
       })
       .overrideComponent(WorkflowItemSearchResultAdminWorkflowGridElementComponent, {
         set: {
-          entryComponents: [PublicationGridElementComponent]
+          entryComponents: [ItemGridElementComponent]
         }
       })
       .compileComponents();
diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html
index 1a90a4cff4b..4d7266514c5 100644
--- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html
+++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html
@@ -1,7 +1,7 @@
-<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeletePath()]" [title]="'admin.workflow.item.delete' | translate">
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
     <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
 </a>
 
-<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackPath()]" [title]="'admin.workflow.item.send-back' | translate">
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackRoute()]" [title]="'admin.workflow.item.send-back' | translate">
     <i class="fa fa-hand-point-left"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.send-back" | translate}}</span>
 </a>
diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts
index bca26843645..5e0ff481a0c 100644
--- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts
+++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts
@@ -5,19 +5,22 @@ import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Item } from '../../../core/shared/item.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { WorkflowItemAdminWorkflowActionsComponent } from './workflow-item-admin-workflow-actions.component';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import {
+    getWorkflowItemSendBackRoute,
+    getWorkflowItemDeleteRoute
+} from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { getItemEditRoute } from '../../../+item-page/item-page-routing-paths';
 import {
-  ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
-  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_REINSTATE_PATH,
   ITEM_EDIT_WITHDRAW_PATH
-} from '../../../+item-page/edit-item-page/edit-item-page.routing.module';
-import { getItemEditPath } from '../../../+item-page/item-page-routing.module';
-import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { WorkflowItemAdminWorkflowActionsComponent } from './workflow-item-admin-workflow-actions.component';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { getWorkflowItemDeletePath, getWorkflowItemSendBackPath } from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing.module';
+} from '../../../+item-page/edit-item-page/edit-item-page.routing-paths';
 
 describe('WorkflowItemAdminWorkflowActionsComponent', () => {
   let component: WorkflowItemAdminWorkflowActionsComponent;
@@ -57,12 +60,12 @@ describe('WorkflowItemAdminWorkflowActionsComponent', () => {
   it('should render a delete button with the correct link', () => {
     const button = fixture.debugElement.query(By.css('a.delete-link'));
     const link = button.nativeElement.href;
-    expect(link).toContain(new URLCombiner(getWorkflowItemDeletePath(wfi.id)).toString());
+    expect(link).toContain(new URLCombiner(getWorkflowItemDeleteRoute(wfi.id)).toString());
   });
 
   it('should render a move button with the correct link', () => {
     const a = fixture.debugElement.query(By.css('a.send-back-link'));
     const link = a.nativeElement.href;
-    expect(link).toContain(new URLCombiner(getWorkflowItemSendBackPath(wfi.id)).toString());
+    expect(link).toContain(new URLCombiner(getWorkflowItemSendBackRoute(wfi.id)).toString());
   });
 });
diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts
index d44f870b14c..9dba0e9fd40 100644
--- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts
+++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts
@@ -1,6 +1,9 @@
 import { Component, Input } from '@angular/core';
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { getWorkflowItemDeletePath, getWorkflowItemSendBackPath } from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing.module';
+import {
+    getWorkflowItemSendBackRoute,
+    getWorkflowItemDeleteRoute
+} from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 @Component({
   selector: 'ds-workflow-item-admin-workflow-actions-element',
@@ -25,15 +28,15 @@ export class WorkflowItemAdminWorkflowActionsComponent {
   /**
    * Returns the path to the delete page of this workflow item
    */
-  getDeletePath(): string {
+  getDeleteRoute(): string {
 
-    return getWorkflowItemDeletePath(this.wfi.id)
+    return getWorkflowItemDeleteRoute(this.wfi.id)
   }
 
   /**
    * Returns the path to the send back page of this workflow item
    */
-  getSendBackPath(): string {
-    return getWorkflowItemSendBackPath(this.wfi.id);
+  getSendBackRoute(): string {
+    return getWorkflowItemSendBackRoute(this.wfi.id);
   }
 }
diff --git a/src/app/+admin/admin.module.ts b/src/app/+admin/admin.module.ts
index 25b8bd46483..c350272c3be 100644
--- a/src/app/+admin/admin.module.ts
+++ b/src/app/+admin/admin.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
 import { AdminAccessControlModule } from './admin-access-control/admin-access-control.module';
+import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
 import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
 import { AdminRoutingModule } from './admin-routing.module';
 import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
@@ -16,6 +17,7 @@ import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './adm
 import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component';
 import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
 import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
+import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
 
 @NgModule({
   imports: [
@@ -35,10 +37,13 @@ import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow
     CommunityAdminSearchResultGridElementComponent,
     CollectionAdminSearchResultGridElementComponent,
     ItemAdminSearchResultActionsComponent,
+    AdminCurationTasksComponent,
 
     WorkflowItemSearchResultAdminWorkflowListElementComponent,
     WorkflowItemSearchResultAdminWorkflowGridElementComponent,
-    WorkflowItemAdminWorkflowActionsComponent
+    WorkflowItemAdminWorkflowActionsComponent,
+
+    MetadataImportPageComponent
 
   ],
   entryComponents: [
@@ -52,7 +57,9 @@ import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow
 
     WorkflowItemSearchResultAdminWorkflowListElementComponent,
     WorkflowItemSearchResultAdminWorkflowGridElementComponent,
-    WorkflowItemAdminWorkflowActionsComponent
+    WorkflowItemAdminWorkflowActionsComponent,
+
+    MetadataImportPageComponent
   ]
 })
 export class AdminModule {
diff --git a/src/app/+bitstream-page/bitstream-page.resolver.ts b/src/app/+bitstream-page/bitstream-page.resolver.ts
index 8e9f64fcc19..a0520ad1655 100644
--- a/src/app/+bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/+bitstream-page/bitstream-page.resolver.ts
@@ -2,10 +2,10 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { RemoteData } from '../core/data/remote-data';
 import { Observable } from 'rxjs/internal/Observable';
-import { find } from 'rxjs/operators';
-import { hasValue } from '../shared/empty.util';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import {followLink, FollowLinkConfig} from '../shared/utils/follow-link-config.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
  * This class represents a resolver that requests a specific bitstream before the route is activated
@@ -23,9 +23,20 @@ export class BitstreamPageResolver implements Resolve<RemoteData<Bitstream>> {
    * or an error if something went wrong
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Bitstream>> {
-    return this.bitstreamService.findById(route.params.id)
+    return this.bitstreamService.findById(route.params.id, false, ...this.followLinks)
       .pipe(
-        find((RD) => hasValue(RD.error) || RD.hasSucceeded),
+        getFirstCompletedRemoteData(),
       );
   }
+    /**
+     * Method that returns the follow links to already resolve
+     * The self links defined in this list are expected to be requested somewhere in the near future
+     * Requesting them as embeds will limit the number of requests
+     */
+    get followLinks(): Array<FollowLinkConfig<Bitstream>> {
+        return [
+            followLink('bundle', undefined, true, followLink('item')),
+            followLink('format')
+        ];
+    }
 }
diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index c802622dc48..fd106749617 100644
--- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -2,9 +2,8 @@ import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
-import { RemoteData } from '../../core/data/remote-data';
 import { of as observableOf } from 'rxjs/internal/observable/of';
-import { ActivatedRoute } from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import { DynamicFormControlModel, DynamicFormService } from '@ng-dynamic-forms/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
@@ -17,11 +16,15 @@ import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
 import { hasValue } from '../../shared/empty.util';
 import { FormControl, FormGroup } from '@angular/forms';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { PageInfo } from '../../core/shared/page-info.model';
 import { FileSizePipe } from '../../shared/utils/file-size-pipe';
-import { RestResponse } from '../../core/cache/response.models';
 import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import {RouterStub} from '../../shared/testing/router.stub';
+import { getItemEditRoute } from '../../+item-page/item-page-routing-paths';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -34,6 +37,8 @@ let bitstreamFormatService: BitstreamFormatDataService;
 let bitstream: Bitstream;
 let selectedFormat: BitstreamFormat;
 let allFormats: BitstreamFormat[];
+let router: Router;
+let routerStub;
 
 describe('EditBitstreamPageComponent', () => {
   let comp: EditBitstreamPageComponent;
@@ -102,31 +107,41 @@ describe('EditBitstreamPageComponent', () => {
           }
         ]
       },
-      format: observableOf(new RemoteData(false, false, true, null, selectedFormat)),
+      format: createSuccessfulRemoteDataObject$(selectedFormat),
       _links: {
         self: 'bitstream-selflink'
-      }
+      },
+      bundle: createSuccessfulRemoteDataObject$({
+        item: createSuccessfulRemoteDataObject$({
+          uuid: 'some-uuid'
+        })
+      })
     });
     bitstreamService = jasmine.createSpyObj('bitstreamService', {
-      findById: observableOf(new RemoteData(false, false, true, null, bitstream)),
-      update: observableOf(new RemoteData(false, false, true, null, bitstream)),
-      updateFormat: observableOf(new RestResponse(true, 200, 'OK')),
+      findById: createSuccessfulRemoteDataObject$(bitstream),
+      update: createSuccessfulRemoteDataObject$(bitstream),
+      updateFormat: createSuccessfulRemoteDataObject$(bitstream),
       commitUpdates: {},
       patch: {}
     });
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-      findAll: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), allFormats)))
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
     });
 
+    const itemPageUrl = `fake-url/some-uuid`;
+    routerStub = Object.assign(new RouterStub(), {
+      url: `${itemPageUrl}`
+    });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule],
       declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
       providers: [
         { provide: NotificationsService, useValue: notificationsService },
         { provide: DynamicFormService, useValue: formService },
-        { provide: ActivatedRoute, useValue: { data: observableOf({ bitstream: new RemoteData(false, false, true, null, bitstream) }), snapshot: { queryParams: {} } } },
+        { provide: ActivatedRoute, useValue: { data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }), snapshot: { queryParams: {} } } },
         { provide: BitstreamDataService, useValue: bitstreamService },
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+        { provide: Router, useValue: routerStub },
         ChangeDetectorRef
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -138,6 +153,7 @@ describe('EditBitstreamPageComponent', () => {
     fixture = TestBed.createComponent(EditBitstreamPageComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
+    router = (comp as any).router;
   });
 
   describe('on startup', () => {
@@ -213,4 +229,25 @@ describe('EditBitstreamPageComponent', () => {
       });
     });
   });
+  describe('when the cancel button is clicked', () => {
+    it('should call navigateToItemEditBitstreams method', () => {
+      spyOn(comp, 'navigateToItemEditBitstreams');
+      comp.onCancel();
+      expect(comp.navigateToItemEditBitstreams).toHaveBeenCalled();
+    });
+  });
+  describe('when navigateToItemEditBitstreams is called, and the component has an itemId', () => {
+    it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
+      comp.itemId = 'some-uuid1'
+      comp.navigateToItemEditBitstreams();
+      expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditRoute('some-uuid1'), 'bitstreams']);
+    });
+  });
+  describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {
+    it('should redirect to the item edit page on the bitstreams tab with the itemId from the bundle links ', () => {
+      comp.itemId = undefined;
+      comp.navigateToItemEditBitstreams();
+      expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditRoute('some-uuid'), 'bitstreams']);
+    });
+  });
 });
diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index cce6932cd19..fbb5cc7b8ee 100644
--- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ActivatedRoute, Router } from '@angular/router';
-import { filter, map, switchMap } from 'rxjs/operators';
+import { map, mergeMap, switchMap } from 'rxjs/operators';
 import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
 import { Subscription } from 'rxjs/internal/Subscription';
 import {
@@ -19,24 +19,25 @@ import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-f
 import { cloneDeep } from 'lodash';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import {
-  getAllSucceededRemoteData, getAllSucceededRemoteDataPayload,
+  getAllSucceededRemoteDataPayload,
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
-  getSucceededRemoteData
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
 } from '../../core/shared/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
-import { RestResponse } from '../../core/cache/response.models';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { Metadata } from '../../core/shared/metadata.utils';
 import { Location } from '@angular/common';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { getItemEditPath } from '../../+item-page/item-page-routing.module';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { getItemEditRoute } from '../../+item-page/item-page-routing-paths';
+import { Bundle } from '../../core/shared/bundle.model';
+import { Item } from '../../core/shared/item.model';
 
 @Component({
   selector: 'ds-edit-bitstream-page',
@@ -298,17 +299,12 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions);
 
     const bitstream$ = this.bitstreamRD$.pipe(
-      getSucceededRemoteData(),
-      getRemoteDataPayload(),
-      switchMap((bitstream: Bitstream) => this.bitstreamService.findById(bitstream.id, followLink('format')).pipe(
-        getAllSucceededRemoteData(),
-        getRemoteDataPayload(),
-        filter((bs: Bitstream) => hasValue(bs)))
-      )
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload()
     );
 
     const allFormats$ = this.bitstreamFormatsRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload()
     );
 
@@ -442,16 +438,15 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
 
     if (isNewFormat) {
       bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
-        switchMap((formatResponse: RestResponse) => {
-          if (hasValue(formatResponse) && !formatResponse.isSuccessful) {
+        getFirstCompletedRemoteData(),
+        map((formatResponse: RemoteData<Bitstream>) => {
+          if (hasValue(formatResponse) && formatResponse.hasFailed) {
             this.notificationsService.error(
               this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.format.title'),
-              formatResponse.statusText
+              formatResponse.errorMessage
             );
           } else {
-            return this.bitstreamService.findById(this.bitstream.id).pipe(
-              getFirstSucceededRemoteDataPayload()
-            );
+            return formatResponse.payload;
           }
         })
       );
@@ -501,14 +496,18 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * When the item ID is present, navigate back to the item's edit bitstreams page, otherwise go back to the previous
-   * page the user came from
+   * When the item ID is present, navigate back to the item's edit bitstreams page,
+   * otherwise retrieve the item ID based on the owning bundle's link
    */
   navigateToItemEditBitstreams() {
     if (hasValue(this.itemId)) {
-      this.router.navigate([getItemEditPath(this.itemId), 'bitstreams']);
+      this.router.navigate([getItemEditRoute(this.itemId), 'bitstreams']);
     } else {
-      this.location.back();
+      this.bitstream.bundle.pipe(getFirstSucceededRemoteDataPayload(),
+          mergeMap((bundle: Bundle) => bundle.item.pipe(getFirstSucceededRemoteDataPayload(), map((item: Item) => item.uuid))))
+          .subscribe((item) => {
+            this.router.navigate(([getItemEditRoute(item), 'bitstreams']));
+          });
     }
   }
 
diff --git a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts b/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
index 0a681cce478..b9b2b8e11e7 100644
--- a/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, Inject } from '@angular/core';
+import { ChangeDetectorRef, Component } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
   browseParamsToOptions
@@ -43,7 +43,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
 
   ngOnInit(): void {
     this.startsWithType = StartsWithType.date;
-    this.updatePage(new BrowseEntrySearchOptions(null, this.paginationConfig, this.sortConfig));
+    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, this.sortConfig));
     this.subs.push(
       observableCombineLatest(
         this.route.params,
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 873f6ef464c..1fcccb79c78 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -12,7 +12,7 @@ import { of as observableOf } from 'rxjs/internal/observable/of';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
@@ -157,5 +157,5 @@ describe('BrowseByMetadataPageComponent', () => {
 });
 
 export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
-  return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), objects));
+  return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), objects));
 }
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index a2964e6abf4..3b67d2e3d04 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,7 +1,7 @@
-import {combineLatest as observableCombineLatest, merge as observableMerge, Observable, Subscription } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -10,10 +10,9 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Item } from '../../core/shared/item.model';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
-import { getSucceededRemoteData } from '../../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../../core/shared/operators';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { take } from 'rxjs/operators';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator';
 
@@ -105,7 +104,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.updatePage(new BrowseEntrySearchOptions(null, this.paginationConfig, this.sortConfig));
+    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, this.sortConfig));
     this.subs.push(
       observableCombineLatest(
         this.route.params,
@@ -169,7 +168,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
   updateParent(scope: string) {
     if (hasValue(scope)) {
       this.parent$ = this.dsoService.findById(scope).pipe(
-        getSucceededRemoteData()
+        getFirstSucceededRemoteData()
       );
     }
   }
@@ -179,11 +178,11 @@ export class BrowseByMetadataPageComponent implements OnInit {
    */
   goPrev() {
     if (this.items$) {
-      this.items$.pipe(take(1)).subscribe((items) => {
+      this.items$.pipe(getFirstSucceededRemoteData()).subscribe((items) => {
         this.items$ = this.browseService.getPrevBrowseItems(items);
       });
     } else if (this.browseEntries$) {
-      this.browseEntries$.pipe(take(1)).subscribe((entries) => {
+      this.browseEntries$.pipe(getFirstSucceededRemoteData()).subscribe((entries) => {
         this.browseEntries$ = this.browseService.getPrevBrowseEntries(entries);
       });
     }
@@ -194,11 +193,11 @@ export class BrowseByMetadataPageComponent implements OnInit {
    */
   goNext() {
     if (this.items$) {
-      this.items$.pipe(take(1)).subscribe((items) => {
+      this.items$.pipe(getFirstSucceededRemoteData()).subscribe((items) => {
         this.items$ = this.browseService.getNextBrowseItems(items);
       });
     } else if (this.browseEntries$) {
-      this.browseEntries$.pipe(take(1)).subscribe((entries) => {
+      this.browseEntries$.pipe(getFirstSucceededRemoteData()).subscribe((entries) => {
         this.browseEntries$ = this.browseService.getNextBrowseEntries(entries);
       });
     }
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
index 91713cd2190..da274fff1e1 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
@@ -32,7 +32,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
 
   ngOnInit(): void {
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    this.updatePage(new BrowseEntrySearchOptions(null, this.paginationConfig, this.sortConfig));
+    this.updatePage(new BrowseEntrySearchOptions(this.defaultBrowseId, this.paginationConfig, this.sortConfig));
     this.subs.push(
       observableCombineLatest(
         this.route.params,
diff --git a/src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts b/src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts
index 5759e287545..fc8b40267a6 100644
--- a/src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts
+++ b/src/app/+browse-by/browse-by-dso-breadcrumb.resolver.ts
@@ -6,10 +6,10 @@ import { Collection } from '../core/shared/collection.model';
 import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { Observable } from 'rxjs';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../core/shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
 import { map } from 'rxjs/operators';
 import { hasValue } from '../shared/empty.util';
-import { getDSOPath } from '../app-routing.module';
+import { getDSORoute } from '../app-routing-paths';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject on a browse by page
@@ -29,10 +29,10 @@ export class BrowseByDSOBreadcrumbResolver {
     const uuid = route.queryParams.scope;
     if (hasValue(uuid)) {
       return this.dataService.findById(uuid).pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
         map((object: Community | Collection) => {
-          return { provider: this.breadcrumbService, key: object, url: getDSOPath(object) };
+          return { provider: this.breadcrumbService, key: object, url: getDSORoute(object) };
         })
       );
     }
diff --git a/src/app/+browse-by/browse-by-guard.ts b/src/app/+browse-by/browse-by-guard.ts
index 3ba282d41cb..c734d30e49e 100644
--- a/src/app/+browse-by/browse-by-guard.ts
+++ b/src/app/+browse-by/browse-by-guard.ts
@@ -3,7 +3,7 @@ import { Inject, Injectable } from '@angular/core';
 import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service';
 import { hasNoValue, hasValue } from '../shared/empty.util';
 import { map } from 'rxjs/operators';
-import { getSucceededRemoteData } from '../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../core/shared/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { environment } from '../../environments/environment';
@@ -32,7 +32,7 @@ export class BrowseByGuard implements CanActivate {
     const value = route.queryParams.value;
     const metadataTranslated = this.translate.instant('browse.metadata.' + id);
     if (hasValue(scope)) {
-      const dsoAndMetadata$ = this.dsoService.findById(scope).pipe(getSucceededRemoteData());
+      const dsoAndMetadata$ = this.dsoService.findById(scope).pipe(getFirstSucceededRemoteData());
       return dsoAndMetadata$.pipe(
         map((dsoRD) => {
           const name = dsoRD.payload.name;
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
index b0a93bd2760..9a79ac91527 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -1,4 +1,3 @@
-import { filter, tap } from 'rxjs/operators';
 import { CollectionItemMapperComponent } from './collection-item-mapper.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -22,8 +21,6 @@ import { EventEmitter } from '@angular/core';
 import { HostWindowService } from '../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { By } from '@angular/platform-browser';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { PageInfo } from '../../core/shared/page-info.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
@@ -39,6 +36,12 @@ import { LoadingComponent } from '../../shared/loading/loading.component';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { SearchService } from '../../core/shared/search/search.service';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 describe('CollectionItemMapperComponent', () => {
   let comp: CollectionItemMapperComponent;
@@ -60,7 +63,7 @@ describe('CollectionItemMapperComponent', () => {
       }
     }
   });
-  const mockCollectionRD: RemoteData<Collection> = new RemoteData<Collection>(false, false, true, null, mockCollection);
+  const mockCollectionRD: RemoteData<Collection> = createSuccessfulRemoteDataObject(mockCollection);
   const mockSearchOptions = of(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
@@ -81,7 +84,7 @@ describe('CollectionItemMapperComponent', () => {
     paginatedSearchOptions: mockSearchOptions
   };
   const itemDataServiceStub = {
-    mapToCollection: () => of(new RestResponse(true, 200, 'OK'))
+    mapToCollection: () => createSuccessfulRemoteDataObject$({})
   };
   const activatedRouteStub = new ActivatedRouteStub({}, { dso: mockCollectionRD });
   const translateServiceStub = {
@@ -90,7 +93,7 @@ describe('CollectionItemMapperComponent', () => {
     onTranslationChange: new EventEmitter(),
     onDefaultLangChange: new EventEmitter()
   };
-  const emptyList = new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []));
+  const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => of(emptyList),
     /* tslint:disable:no-empty */
@@ -167,7 +170,7 @@ describe('CollectionItemMapperComponent', () => {
     });
 
     it('should display an error message if at least one mapping was unsuccessful', () => {
-      spyOn(itemDataService, 'mapToCollection').and.returnValue(of(new RestResponse(false, 404, 'Not Found')));
+      spyOn(itemDataService, 'mapToCollection').and.returnValue(createFailedRemoteDataObject$('Not Found', 404));
       comp.mapItems(ids);
       expect(notificationsService.success).not.toHaveBeenCalled();
       expect(notificationsService.error).toHaveBeenCalled();
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 64ad4265842..2fc999ad19a 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -5,9 +5,13 @@ import { fadeIn, fadeInOut } from '../../shared/animations/fade';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { map, startWith, switchMap, take } from 'rxjs/operators';
-import { getRemoteDataPayload, getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  toDSpaceObjectListRD
+} from '../../core/shared/operators';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
@@ -16,13 +20,13 @@ import { ItemDataService } from '../../core/data/item-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { isNotEmpty } from '../../shared/empty.util';
-import { RestResponse } from '../../core/cache/response.models';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -102,7 +106,7 @@ export class CollectionItemMapperComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.collectionRD$ = this.route.data.pipe(map((data) => data.dso)).pipe(getSucceededRemoteData()) as Observable<RemoteData<Collection>>;
+    this.collectionRD$ = this.route.data.pipe(map((data) => data.dso)).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Collection>>;
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.loadItemLists();
   }
@@ -133,7 +137,7 @@ export class CollectionItemMapperComponent implements OnInit {
             return this.searchService.search(Object.assign(new PaginatedSearchOptions(options), {
               query: this.buildQuery(collectionRD.payload.id, options.query),
               scope: undefined,
-              dsoType: DSpaceObjectType.ITEM,
+              dsoTypes: [DSpaceObjectType.ITEM],
               sort: this.defaultSortOptions
             }), 10000).pipe(
               toDSpaceObjectListRD(),
@@ -151,7 +155,7 @@ export class CollectionItemMapperComponent implements OnInit {
    */
   mapItems(ids: string[], remove?: boolean) {
     const responses$ = this.collectionRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((collectionRD: RemoteData<Collection>) => collectionRD.payload),
       switchMap((collection: Collection) =>
         observableCombineLatest(ids.map((id: string) =>
@@ -168,12 +172,12 @@ export class CollectionItemMapperComponent implements OnInit {
    * @param {Observable<RestResponse[]>} responses$   The responses after adding/removing a mapping
    * @param {boolean} remove                          Whether or not the goal was to remove mappings
    */
-  private showNotifications(responses$: Observable<RestResponse[]>, remove?: boolean) {
+  private showNotifications(responses$: Observable<Array<RemoteData<NoContent>>>, remove?: boolean) {
     const messageInsertion = remove ? 'unmap' : 'map';
 
-    responses$.subscribe((responses: RestResponse[]) => {
-      const successful = responses.filter((response: RestResponse) => response.isSuccessful);
-      const unsuccessful = responses.filter((response: RestResponse) => !response.isSuccessful);
+    responses$.subscribe((responses: Array<RemoteData<NoContent>>) => {
+      const successful = responses.filter((response: RemoteData<any>) => response.hasSucceeded);
+      const unsuccessful = responses.filter((response: RemoteData<any>) => response.hasFailed);
       if (successful.length > 0) {
         const successMessages = observableCombineLatest(
           this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.head`),
@@ -246,7 +250,7 @@ export class CollectionItemMapperComponent implements OnInit {
    */
   onCancel() {
     this.collectionRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       take(1)
     ).subscribe((collection: Collection) => {
diff --git a/src/app/+collection-page/collection-page-administrator.guard.ts b/src/app/+collection-page/collection-page-administrator.guard.ts
new file mode 100644
index 00000000000..4f7c6f985bf
--- /dev/null
+++ b/src/app/+collection-page/collection-page-administrator.guard.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Collection } from '../core/shared/collection.model';
+import { CollectionPageResolver } from './collection-page.resolver';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { of as observableOf } from 'rxjs';
+import { DsoPageFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard';
+import { Observable } from 'rxjs/internal/Observable';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { AuthService } from '../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Collection} pages requiring administrator rights
+ */
+export class CollectionPageAdministratorGuard extends DsoPageFeatureGuard<Collection> {
+  constructor(protected resolver: CollectionPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/+collection-page/collection-page-routing-paths.ts b/src/app/+collection-page/collection-page-routing-paths.ts
new file mode 100644
index 00000000000..e95b5f6f2d7
--- /dev/null
+++ b/src/app/+collection-page/collection-page-routing-paths.ts
@@ -0,0 +1,30 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+
+export const COLLECTION_PARENT_PARAMETER = 'parent';
+
+export const COLLECTION_MODULE_PATH = 'collections';
+
+export function getCollectionModuleRoute() {
+  return `/${COLLECTION_MODULE_PATH}`;
+}
+
+export function getCollectionPageRoute(collectionId: string) {
+  return new URLCombiner(getCollectionModuleRoute(), collectionId).toString();
+}
+
+export function getCollectionEditRoute(id: string) {
+  return new URLCombiner(getCollectionModuleRoute(), id, COLLECTION_EDIT_PATH).toString()
+}
+
+export function getCollectionCreateRoute() {
+  return new URLCombiner(getCollectionModuleRoute(), COLLECTION_CREATE_PATH).toString()
+}
+
+export function getCollectionEditRolesRoute(id) {
+  return new URLCombiner(getCollectionPageRoute(id), COLLECTION_EDIT_PATH, COLLECTION_EDIT_ROLES_PATH).toString()
+}
+
+export const COLLECTION_CREATE_PATH = 'create';
+export const COLLECTION_EDIT_PATH = 'edit';
+export const COLLECTION_EDIT_ROLES_PATH = 'roles';
+export const ITEMTEMPLATE_PATH = 'itemtemplate';
diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts
index 589defa331f..af2612911bd 100644
--- a/src/app/+collection-page/collection-page-routing.module.ts
+++ b/src/app/+collection-page/collection-page-routing.module.ts
@@ -7,29 +7,21 @@ import { CreateCollectionPageComponent } from './create-collection-page/create-c
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getCollectionModulePath } from '../app-routing.module';
+import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
+import { ItemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
 import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 import { CollectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
 import { LinkService } from '../core/cache/builders/link.service';
-
-export const COLLECTION_PARENT_PARAMETER = 'parent';
-
-export function getCollectionPageRoute(collectionId: string) {
-  return new URLCombiner(getCollectionModulePath(), collectionId).toString();
-}
-
-export function getCollectionEditPath(id: string) {
-  return new URLCombiner(getCollectionModulePath(), id, COLLECTION_EDIT_PATH).toString()
-}
-
-export function getCollectionCreatePath() {
-  return new URLCombiner(getCollectionModulePath(), COLLECTION_CREATE_PATH).toString()
-}
-
-const COLLECTION_CREATE_PATH = 'create';
-const COLLECTION_EDIT_PATH = 'edit';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import {
+  ITEMTEMPLATE_PATH,
+  COLLECTION_EDIT_PATH,
+  COLLECTION_CREATE_PATH
+} from './collection-page-routing-paths';
+import { CollectionPageAdministratorGuard } from './collection-page-administrator.guard';
+import { MenuItemType } from '../shared/menu/initial-menus-state';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 
 @NgModule({
   imports: [
@@ -50,7 +42,7 @@ const COLLECTION_EDIT_PATH = 'edit';
           {
             path: COLLECTION_EDIT_PATH,
             loadChildren: './edit-collection-page/edit-collection-page.module#EditCollectionPageModule',
-            canActivate: [AuthenticatedGuard]
+            canActivate: [CollectionPageAdministratorGuard]
           },
           {
             path: 'delete',
@@ -58,6 +50,16 @@ const COLLECTION_EDIT_PATH = 'edit';
             component: DeleteCollectionPageComponent,
             canActivate: [AuthenticatedGuard],
           },
+          {
+            path: ITEMTEMPLATE_PATH,
+            component: EditItemTemplatePageComponent,
+            canActivate: [AuthenticatedGuard],
+            resolve: {
+              item: ItemTemplatePageResolver,
+              breadcrumb: I18nBreadcrumbResolver
+            },
+            data: { title: 'collection.edit.template.title', breadcrumbKey: 'collection.edit.template' }
+          },
           {
             path: '',
             component: CollectionPageComponent,
@@ -69,16 +71,32 @@ const COLLECTION_EDIT_PATH = 'edit';
             pathMatch: 'full',
             canActivate: [AuthenticatedGuard]
           }
-        ]
+        ],
+        data: {
+          menu: {
+            public: [{
+              id: 'statistics_collection_:id',
+              active: true,
+              visible: true,
+              model: {
+                type: MenuItemType.LINK,
+                text: 'menu.section.statistics',
+                link: 'statistics/collections/:id/',
+              } as LinkMenuItemModel,
+            }],
+          },
+        },
       },
     ])
   ],
   providers: [
     CollectionPageResolver,
+    ItemTemplatePageResolver,
     CollectionBreadcrumbResolver,
     DSOBreadcrumbsService,
     LinkService,
-    CreateCollectionPageGuard
+    CreateCollectionPageGuard,
+    CollectionPageAdministratorGuard
   ]
 })
 export class CollectionPageRoutingModule {
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 98552ed40b7..beb74134151 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -3,37 +3,41 @@
          *ngVar="(collectionRD$ | async) as collectionRD">
         <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
             <div *ngIf="collectionRD?.payload as collection">
-                <ds-view-tracker [object]="collection"></ds-view-tracker>
-                <header class="comcol-header border-bottom mb-4 pb-4">
+              <ds-view-tracker [object]="collection"></ds-view-tracker>
+              <div class="d-flex flex-row border-bottom mb-4 pb-4">
+                <header class="comcol-header mr-auto">
                   <!-- Collection Name -->
-                <ds-comcol-page-header
-                        [name]="collection.name">
-                </ds-comcol-page-header>
-                    <!-- Collection logo -->
-                    <ds-comcol-page-logo *ngIf="logoRD$"
-                                     [logo]="(logoRD$ | async)?.payload"
-                                     [alternateText]="'Collection Logo'"
-                        [alternateText]="'Collection Logo'">
-                    </ds-comcol-page-logo>
+                  <ds-comcol-page-header
+                          [name]="collection.name">
+                  </ds-comcol-page-header>
+                  <!-- Collection logo -->
+                  <ds-comcol-page-logo *ngIf="logoRD$"
+                                   [logo]="(logoRD$ | async)?.payload"
+                                   [alternateText]="'Collection Logo'"
+                      [alternateText]="'Collection Logo'">
+                  </ds-comcol-page-logo>
 
-                 <!-- Handle -->
-                <ds-comcol-page-handle
-                        [content]="collection.handle"
-                        [title]="'collection.page.handle'" >
-                </ds-comcol-page-handle>
-                <!-- Introductory text -->
-                <ds-comcol-page-content
-                        [content]="collection.introductoryText"
-                        [hasInnerHtml]="true">
-                </ds-comcol-page-content>
-                <!-- News -->
-                <ds-comcol-page-content
-                        [content]="collection.sidebarText"
-                        [hasInnerHtml]="true"
-                        [title]="'collection.page.news'">
-                </ds-comcol-page-content>
-
-              </header>
+                  <!-- Handle -->
+                  <ds-comcol-page-handle
+                          [content]="collection.handle"
+                          [title]="'collection.page.handle'" >
+                  </ds-comcol-page-handle>
+                  <!-- Introductory text -->
+                  <ds-comcol-page-content
+                          [content]="collection.introductoryText"
+                          [hasInnerHtml]="true">
+                  </ds-comcol-page-content>
+                  <!-- News -->
+                  <ds-comcol-page-content
+                          [content]="collection.sidebarText"
+                          [hasInnerHtml]="true"
+                          [title]="'collection.page.news'">
+                  </ds-comcol-page-content>
+                </header>
+                <div class="pl-2">
+                  <ds-dso-page-edit-button [pageRoutePrefix]="'collections'" [dso]="collection" [tooltipMsg]="'collection.page.edit'"></ds-dso-page-edit-button>
+                </div>
+              </div>
               <section class="comcol-page-browse-section">
               <!-- Browse-By Links -->
               <ds-comcol-page-browse-by
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index 7f54e0f9d78..e5084cb61f0 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -1,12 +1,12 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject, of as observableOf, Observable, Subject } from 'rxjs';
-import { filter, flatMap, map, startWith, switchMap, take, tap } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { filter, flatMap, map, startWith, switchMap, take } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 import { SearchService } from '../core/shared/search/search.service';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../core/data/collection-data.service';
-import { PaginatedList } from '../core/data/paginated-list';
+import { PaginatedList } from '../core/data/paginated-list.model';
 import { RemoteData } from '../core/data/remote-data';
 
 import { MetadataService } from '../core/metadata/metadata.service';
@@ -16,14 +16,15 @@ import { Collection } from '../core/shared/collection.model';
 import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
 import { Item } from '../core/shared/item.model';
 import {
-  getSucceededRemoteData,
-  redirectToPageNotFoundOn404,
+  getFirstSucceededRemoteData,
+  redirectOn4xx,
   toDSpaceObjectListRD
 } from '../core/shared/operators';
 
 import { fadeIn, fadeInOut } from '../shared/animations/fade';
-import { hasNoValue, hasValue, isNotEmpty } from '../shared/empty.util';
+import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { AuthService } from '../core/auth/auth.service';
 
 @Component({
   selector: 'ds-collection-page',
@@ -51,7 +52,8 @@ export class CollectionPageComponent implements OnInit {
     private searchService: SearchService,
     private metadata: MetadataService,
     private route: ActivatedRoute,
-    private router: Router
+    private router: Router,
+    private authService: AuthService,
   ) {
     this.paginationConfig = new PaginationComponentOptions();
     this.paginationConfig.id = 'collection-page-pagination';
@@ -63,7 +65,7 @@ export class CollectionPageComponent implements OnInit {
   ngOnInit(): void {
     this.collectionRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Collection>),
-      redirectToPageNotFoundOn404(this.router),
+      redirectOn4xx(this.router, this.authService),
       take(1)
     );
     this.logoRD$ = this.collectionRD$.pipe(
@@ -79,7 +81,7 @@ export class CollectionPageComponent implements OnInit {
 
     this.itemRD$ = this.paginationChanges$.pipe(
       switchMap((dto) => this.collectionRD$.pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         map((rd) => rd.payload.id),
         switchMap((id: string) => {
           return this.searchService.search(
@@ -87,7 +89,7 @@ export class CollectionPageComponent implements OnInit {
                 scope: id,
                 pagination: dto.paginationConfig,
                 sort: dto.sortConfig,
-                dsoType: DSpaceObjectType.ITEM
+                dsoTypes: [DSpaceObjectType.ITEM]
               })).pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>
         }),
         startWith(undefined) // Make sure switching pages shows loading component
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index 03daae68ae1..554d56815a5 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -8,6 +8,8 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module';
 import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
 import { CollectionFormComponent } from './collection-form/collection-form.component';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
+import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
+import { EditItemPageModule } from '../+item-page/edit-item-page/edit-item-page.module';
 import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 import { SearchService } from '../core/shared/search/search.service';
 import { StatisticsModule } from '../statistics/statistics.module';
@@ -17,13 +19,15 @@ import { StatisticsModule } from '../statistics/statistics.module';
     CommonModule,
     SharedModule,
     CollectionPageRoutingModule,
-    StatisticsModule.forRoot()
+    StatisticsModule.forRoot(),
+    EditItemPageModule
   ],
   declarations: [
     CollectionPageComponent,
     CreateCollectionPageComponent,
     DeleteCollectionPageComponent,
     CollectionFormComponent,
+    EditItemTemplatePageComponent,
     CollectionItemMapperComponent
   ],
   exports: [
diff --git a/src/app/+collection-page/collection-page.resolver.spec.ts b/src/app/+collection-page/collection-page.resolver.spec.ts
index 5034b8d3694..5ded339fb82 100644
--- a/src/app/+collection-page/collection-page.resolver.spec.ts
+++ b/src/app/+collection-page/collection-page.resolver.spec.ts
@@ -1,6 +1,6 @@
 import { first } from 'rxjs/operators';
-import { of as observableOf } from 'rxjs';
 import { CollectionPageResolver } from './collection-page.resolver';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 
 describe('CollectionPageResolver', () => {
   describe('resolve', () => {
@@ -10,17 +10,18 @@ describe('CollectionPageResolver', () => {
 
     beforeEach(() => {
       collectionService = {
-        findById: (id: string) => observableOf({ payload: { id }, hasSucceeded: true })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
       };
       resolver = new CollectionPageResolver(collectionService);
     });
 
-    it('should resolve a collection with the correct id', () => {
+    it('should resolve a collection with the correct id', (done) => {
       resolver.resolve({ params: { id: uuid } } as any, undefined)
         .pipe(first())
         .subscribe(
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
+            done();
           }
         );
     });
diff --git a/src/app/+collection-page/collection-page.resolver.ts b/src/app/+collection-page/collection-page.resolver.ts
index 1c535e10aa7..8377afacfcc 100644
--- a/src/app/+collection-page/collection-page.resolver.ts
+++ b/src/app/+collection-page/collection-page.resolver.ts
@@ -4,9 +4,8 @@ import { Collection } from '../core/shared/collection.model';
 import { Observable } from 'rxjs';
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { RemoteData } from '../core/data/remote-data';
-import { find } from 'rxjs/operators';
-import { hasValue } from '../shared/empty.util';
 import { followLink } from '../shared/utils/follow-link-config.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
  * This class represents a resolver that requests a specific collection before the route is activated
@@ -24,8 +23,8 @@ export class CollectionPageResolver implements Resolve<RemoteData<Collection>> {
    * or an error if something went wrong
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Collection>> {
-    return this.collectionService.findById(route.params.id, followLink('logo')).pipe(
-      find((RD) => hasValue(RD.error) || RD.hasSucceeded),
+    return this.collectionService.findById(route.params.id, false, followLink('logo')).pipe(
+      getFirstCompletedRemoteData()
     );
   }
 }
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts
index d64e510a23c..13047593cd6 100644
--- a/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts
+++ b/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts
@@ -12,6 +12,7 @@ import { CommunityDataService } from '../../core/data/community-data.service';
 import { CreateCollectionPageComponent } from './create-collection-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import {RequestService} from '../../core/data/request.service';
 
 describe('CreateCollectionPageComponent', () => {
   let comp: CreateCollectionPageComponent;
@@ -29,7 +30,8 @@ describe('CreateCollectionPageComponent', () => {
         },
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: RequestService, useValue: {}}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.ts b/src/app/+collection-page/create-collection-page/create-collection-page.component.ts
index ae31b94c3dd..a38739c407e 100644
--- a/src/app/+collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/+collection-page/create-collection-page/create-collection-page.component.ts
@@ -7,6 +7,7 @@ import { Collection } from '../../core/shared/collection.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import {RequestService} from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can create a new Collection
@@ -26,8 +27,9 @@ export class CreateCollectionPageComponent extends CreateComColPageComponent<Col
     protected routeService: RouteService,
     protected router: Router,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
+    protected requestService: RequestService
   ) {
-    super(collectionDataService, communityDataService, routeService, router, notificationsService, translate);
+    super(collectionDataService, communityDataService, routeService, router, notificationsService, translate, requestService);
   }
 }
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts b/src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts
index 6e8923ac93b..91c2c47466e 100644
--- a/src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts
+++ b/src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts
@@ -18,7 +18,7 @@ describe('CreateCollectionPageGuard', () => {
           } else if (id === 'invalid-id') {
             return createSuccessfulRemoteDataObject$(undefined);
           } else if (id === 'error-id') {
-            return createFailedRemoteDataObject$(new Community());
+            return createFailedRemoteDataObject$('not found', 404);
           }
         }
       };
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.guard.ts b/src/app/+collection-page/create-collection-page/create-collection-page.guard.ts
index 4cd842e926f..ca84231912b 100644
--- a/src/app/+collection-page/create-collection-page/create-collection-page.guard.ts
+++ b/src/app/+collection-page/create-collection-page/create-collection-page.guard.ts
@@ -5,9 +5,9 @@ import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
-import { getFinishedRemoteData } from '../../core/shared/operators';
 import { map, tap } from 'rxjs/operators';
 import { Observable, of as observableOf } from 'rxjs';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 
 /**
  * Prevent creation of a collection without a parent community provided
@@ -29,18 +29,15 @@ export class CreateCollectionPageGuard implements CanActivate {
       this.router.navigate(['/404']);
       return observableOf(false);
     }
-    const parent: Observable<RemoteData<Community>> = this.communityService.findById(parentID)
+    return this.communityService.findById(parentID)
       .pipe(
-        getFinishedRemoteData(),
-      );
-
-    return parent.pipe(
-      map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)),
-      tap((isValid: boolean) => {
-        if (!isValid) {
-          this.router.navigate(['/404']);
-        }
-      })
+        getFirstCompletedRemoteData(),
+        map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)),
+        tap((isValid: boolean) => {
+          if (!isValid) {
+            this.router.navigate(['/404']);
+          }
+        })
     );
   }
 }
diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts
index d64c1d19158..efe7e995508 100644
--- a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts
+++ b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts
@@ -9,6 +9,7 @@ import { of as observableOf } from 'rxjs';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { DeleteCollectionPageComponent } from './delete-collection-page.component';
 import { CollectionDataService } from '../../core/data/collection-data.service';
+import {RequestService} from '../../core/data/request.service';
 
 describe('DeleteCollectionPageComponent', () => {
   let comp: DeleteCollectionPageComponent;
@@ -22,6 +23,7 @@ describe('DeleteCollectionPageComponent', () => {
         { provide: CollectionDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } },
         { provide: NotificationsService, useValue: {} },
+        { provide: RequestService, useValue: {} }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts
index 5f2bd899424..8daba0abfcb 100644
--- a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -5,6 +5,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { TranslateService } from '@ngx-translate/core';
+import {RequestService} from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can delete an existing Collection
@@ -22,8 +23,9 @@ export class DeleteCollectionPageComponent extends DeleteComColPageComponent<Col
     protected router: Router,
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
+    protected requestService: RequestService
   ) {
-    super(dsoDataService, router, route, notifications, translate);
+    super(dsoDataService, router, route, notifications, translate, requestService);
   }
 }
diff --git a/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html b/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html
new file mode 100644
index 00000000000..fa66186ecee
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.html
@@ -0,0 +1,3 @@
+<div class="container">
+  <ds-resource-policies [resourceType]="'collection'" [resourceUUID]="(dsoRD$ | async)?.payload?.id"></ds-resource-policies>
+</div>
diff --git a/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
new file mode 100644
index 00000000000..39f1ee65518
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
@@ -0,0 +1,73 @@
+import { CommonModule } from '@angular/common';
+import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { CollectionAuthorizationsComponent } from './collection-authorizations.component';
+import { Collection } from '../../../core/shared/collection.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+
+describe('CollectionAuthorizationsComponent', () => {
+  let comp: CollectionAuthorizationsComponent<DSpaceObject>;
+  let fixture: ComponentFixture<CollectionAuthorizationsComponent<any>>;
+
+  const collection = Object.assign(new Collection(), {
+    uuid: 'collection',
+    id: 'collection',
+    _links: {
+      self: { href: 'collection-selflink' }
+    }
+  });
+
+  const collectionRD = createSuccessfulRemoteDataObject(collection);
+
+  const routeStub = {
+    parent: {
+      parent: {
+        data: observableOf({
+          dso: collectionRD
+        })
+      }
+    }
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule
+      ],
+      declarations: [CollectionAuthorizationsComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        ChangeDetectorRef,
+        CollectionAuthorizationsComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionAuthorizationsComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    comp = null;
+    fixture.destroy();
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should init dso remote data properly', (done) => {
+    const expected = cold('(a|)', { a: collectionRD });
+    expect(comp.dsoRD$).toBeObservable(expected);
+    done();
+  });
+});
diff --git a/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts b/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
new file mode 100644
index 00000000000..d1b59a0c903
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
@@ -0,0 +1,40 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+import { Observable } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+
+@Component({
+  selector: 'ds-collection-authorizations',
+  templateUrl: './collection-authorizations.component.html',
+})
+/**
+ * Component that handles the Collection Authorizations
+ */
+export class CollectionAuthorizationsComponent<TDomain extends DSpaceObject> implements OnInit {
+
+  /**
+   * The initial DSO object
+   */
+  public dsoRD$: Observable<RemoteData<TDomain>>;
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {ActivatedRoute} route
+   */
+  constructor(
+    private route: ActivatedRoute
+  ) {
+  }
+
+  /**
+   * Initialize the component, setting up the collection
+   */
+  ngOnInit(): void {
+    this.dsoRD$ = this.route.parent.parent.data.pipe(first(), map((data) => data.dso));
+  }
+}
diff --git a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html
index e69de29bb2d..38c9d22f4ed 100644
--- a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html
+++ b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html
@@ -0,0 +1,6 @@
+<div class="container">
+    <h3>{{'collection.curate.header' |translate:{collection: (collectionName$ |async)} }}</h3>
+    <ds-curation-form
+            [dsoHandle]="(dsoRD$|async)?.payload.handle"
+    ></ds-curation-form>
+</div>
diff --git a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
new file mode 100644
index 00000000000..628dd545df6
--- /dev/null
+++ b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
@@ -0,0 +1,69 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
+import { CollectionCurateComponent } from './collection-curate.component';
+import { of as observableOf } from 'rxjs';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { Collection } from '../../../core/shared/collection.model';
+import { ActivatedRoute } from '@angular/router';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+
+describe('CollectionCurateComponent', () => {
+  let comp: CollectionCurateComponent;
+  let fixture: ComponentFixture<CollectionCurateComponent>;
+  let debugEl: DebugElement;
+
+  let routeStub;
+  let dsoNameService;
+
+  const collection = Object.assign(new Collection(), {
+    metadata: {'dc.title': ['Collection Name'], 'dc.identifier.uri': [ { value: '123456789/1'}]}
+  });
+
+  beforeEach(async(() => {
+    routeStub = {
+      parent: {
+        data: observableOf({
+          dso: createSuccessfulRemoteDataObject(collection)
+        })
+      }
+    };
+
+    dsoNameService = jasmine.createSpyObj('dsoNameService', {
+      getName: 'Collection Name'
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [CollectionCurateComponent],
+      providers: [
+        {provide: ActivatedRoute, useValue: routeStub},
+        {provide: DSONameService, useValue: dsoNameService}
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionCurateComponent);
+    comp = fixture.componentInstance;
+    debugEl = fixture.debugElement;
+
+    fixture.detectChanges();
+  });
+  describe('init', () => {
+    it('should initialise the comp', () => {
+      expect(comp).toBeDefined();
+      expect(debugEl.nativeElement.innerHTML).toContain('ds-curation-form');
+    });
+    it('should contain the collection information provided in the route', () => {
+      comp.dsoRD$.subscribe((value) => {
+        expect(value.payload.handle
+        ).toEqual('123456789/1');
+      });
+      comp.collectionName$.subscribe((value) => {
+        expect(value).toEqual('Collection Name');
+      });
+    });
+  });
+});
diff --git a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
index d7deaea9826..e20f229cd64 100644
--- a/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
@@ -1,4 +1,11 @@
 import { Component } from '@angular/core';
+import { filter, map, take } from 'rxjs/operators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Observable } from 'rxjs';
+import { ActivatedRoute } from '@angular/router';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * Component for managing a collection's curation tasks
@@ -8,5 +15,26 @@ import { Component } from '@angular/core';
   templateUrl: './collection-curate.component.html',
 })
 export class CollectionCurateComponent {
-  /* TODO: Implement Collection Edit - Curate */
+  dsoRD$: Observable<RemoteData<Collection>>;
+  collectionName$: Observable<string>;
+
+  constructor(
+    private route: ActivatedRoute,
+    private dsoNameService: DSONameService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.dsoRD$ = this.route.parent.data.pipe(
+      take(1),
+      map((data) => data.dso),
+    );
+
+    this.collectionName$ = this.dsoRD$.pipe(
+      filter((rd: RemoteData<Collection>) => hasValue(rd)),
+      map((rd: RemoteData<Collection>) => {
+        return this.dsoNameService.getName(rd.payload);
+      })
+    );
+  }
 }
diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index 6f3a63790da..b4eaf46bfb7 100644
--- a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,3 +1,21 @@
+<div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
+  <label>{{ 'collection.edit.template.label' | translate}}</label>
+  <div class="button-row">
+    <button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
+      <i class="fas fa-plus"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
+    </button>
+    <button *ngIf="itemTemplateRD?.payload" class="btn btn-danger" (click)="deleteItemTemplate()">
+      <i class="fas fa-trash-alt"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
+    </button>
+    <button *ngIf="itemTemplateRD?.payload" class="btn btn-primary"
+            [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
+      <i class="fas fa-edit"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
+    </button>
+  </div>
+</div>
 <ds-collection-form (submitForm)="onSubmit($event)"
                     [dso]="(dsoRD$ | async)?.payload"
                     (finish)="navigateToHomePage()"></ds-collection-form>
diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
index 6b480c1a79a..aec843afa3e 100644
--- a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
@@ -4,16 +4,54 @@ import { SharedModule } from '../../../shared/shared.module';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CollectionMetadataComponent } from './collection-metadata.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { Item } from '../../../core/shared/item.model';
+import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 describe('CollectionMetadataComponent', () => {
   let comp: CollectionMetadataComponent;
   let fixture: ComponentFixture<CollectionMetadataComponent>;
+  let router: Router;
+  let itemTemplateService: ItemTemplateDataService;
+
+  const template = Object.assign(new Item(), {
+    _links: {
+      self: { href: 'template-selflink' }
+    }
+  });
+  const collection = Object.assign(new Collection(), {
+    uuid: 'collection-id',
+    id: 'collection-id',
+    name: 'Fake Collection',
+    _links: {
+      self: { href: 'collection-selflink' }
+    }
+  });
+
+  const itemTemplateServiceStub = Object.assign({
+    findByCollectionID: () => createSuccessfulRemoteDataObject$(template),
+    create: () => createSuccessfulRemoteDataObject$(template),
+    deleteByCollectionID: () => observableOf(true)
+  });
+
+  const notificationsService = jasmine.createSpyObj('notificationsService', {
+    success: {},
+    error: {}
+  });
+  const objectCache = jasmine.createSpyObj('objectCache', {
+    remove: {}
+  });
+  const requestService = jasmine.createSpyObj('requestService', {
+    removeByHrefSubstring: {}
+  });
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -21,8 +59,11 @@ describe('CollectionMetadataComponent', () => {
       declarations: [CollectionMetadataComponent],
       providers: [
         { provide: CollectionDataService, useValue: {} },
-        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: ItemTemplateDataService, useValue: itemTemplateServiceStub },
+        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: ObjectCacheService, useValue: objectCache },
+        { provide: RequestService, useValue: requestService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -31,12 +72,51 @@ describe('CollectionMetadataComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(CollectionMetadataComponent);
     comp = fixture.componentInstance;
+    router = (comp as any).router;
+    itemTemplateService = (comp as any).itemTemplateService;
     fixture.detectChanges();
   });
 
   describe('frontendURL', () => {
     it('should have the right frontendURL set', () => {
       expect((comp as any).frontendURL).toEqual('/collections/');
-    })
+    });
+  });
+
+  describe('addItemTemplate', () => {
+    it('should navigate to the collection\'s itemtemplate page', () => {
+      spyOn(router, 'navigate');
+      comp.addItemTemplate();
+      expect(router.navigate).toHaveBeenCalledWith(['collections', collection.uuid, 'itemtemplate']);
+    });
+  });
+
+  describe('deleteItemTemplate', () => {
+    describe('when delete returns a success', () => {
+      beforeEach(() => {
+        spyOn(itemTemplateService, 'deleteByCollectionID').and.returnValue(observableOf(true));
+        comp.deleteItemTemplate();
+      });
+
+      it('should display a success notification', () => {
+        expect(notificationsService.success).toHaveBeenCalled();
+      });
+
+      it('should reset related object and request cache', () => {
+        expect(objectCache.remove).toHaveBeenCalledWith(template.self);
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(collection.self);
+      });
+    });
+
+    describe('when delete returns a failure', () => {
+      beforeEach(() => {
+        spyOn(itemTemplateService, 'deleteByCollectionID').and.returnValue(observableOf(false));
+        comp.deleteItemTemplate();
+      });
+
+      it('should display an error notification', () => {
+        expect(notificationsService.error).toHaveBeenCalled();
+      });
+    });
   });
 });
diff --git a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index af2ab7d0a7c..b45b6097313 100644
--- a/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -3,8 +3,17 @@ import { ComcolMetadataComponent } from '../../../shared/comcol-forms/edit-comco
 import { Collection } from '../../../core/shared/collection.model';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
+import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { switchMap, take } from 'rxjs/operators';
+import { combineLatest as combineLatestObservable } from 'rxjs';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
 
 /**
  * Component for editing a collection's metadata
@@ -17,13 +26,91 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
   protected frontendURL = '/collections/';
   protected type = Collection.type;
 
+  /**
+   * The collection's item template
+   */
+  itemTemplateRD$: Observable<RemoteData<Item>>;
+
   public constructor(
     protected collectionDataService: CollectionDataService,
+    protected itemTemplateService: ItemTemplateDataService,
     protected router: Router,
     protected route: ActivatedRoute,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
+    protected objectCache: ObjectCacheService,
+    protected requestService: RequestService
   ) {
     super(collectionDataService, router, route, notificationsService, translate);
   }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.initTemplateItem();
+  }
+
+  /**
+   * Initialize the collection's item template
+   */
+  initTemplateItem() {
+    this.itemTemplateRD$ = this.dsoRD$.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid))
+    );
+  }
+
+  /**
+   * Add a new item template to the collection and redirect to the item template edit page
+   */
+  addItemTemplate() {
+    const collection$ = this.dsoRD$.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      take(1)
+    );
+    const template$ = collection$.pipe(
+      switchMap((collection: Collection) => this.itemTemplateService.create(new Item(), collection.uuid)),
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      take(1)
+    );
+
+    combineLatestObservable(collection$, template$).subscribe(([collection, template]) => {
+      this.router.navigate(['collections', collection.uuid, 'itemtemplate']);
+    });
+  }
+
+  /**
+   * Delete the item template from the collection
+   */
+  deleteItemTemplate() {
+    const collection$ = this.dsoRD$.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      take(1)
+    );
+    const template$ = collection$.pipe(
+      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid)),
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      take(1)
+    );
+
+    combineLatestObservable(collection$, template$).pipe(
+      switchMap(([collection, template]) => {
+        const success$ = this.itemTemplateService.deleteByCollectionID(template, collection.uuid);
+        this.objectCache.remove(template.self);
+        this.requestService.removeByHrefSubstring(collection.self);
+        return success$;
+      })
+    ).subscribe((success: boolean) => {
+      if (success) {
+        this.notificationsService.success(null, this.translate.get('collection.edit.template.notifications.delete.success'));
+      } else {
+        this.notificationsService.error(null, this.translate.get('collection.edit.template.notifications.delete.error'));
+      }
+      this.initTemplateItem();
+    });
+  }
 }
diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html
index dc702ee61ec..9c5020fc7f0 100644
--- a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html
+++ b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html
@@ -1,5 +1,5 @@
 <ds-comcol-role
-  *ngFor="let comcolRole of getComcolRoles() | async"
+  *ngFor="let comcolRole of comcolRoles$ | async"
   [dso]="collection$ | async"
   [comcolRole]="comcolRole"
 >
diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
index 83843855727..5197a459263 100644
--- a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
@@ -11,6 +11,7 @@ import { SharedModule } from '../../../shared/shared.module';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { RequestService } from '../../../core/data/request.service';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 describe('CollectionRolesComponent', () => {
 
@@ -23,51 +24,43 @@ describe('CollectionRolesComponent', () => {
     const route = {
       parent: {
         data: observableOf({
-          dso: new RemoteData(
-            false,
-            false,
-            true,
-            undefined,
+          dso: createSuccessfulRemoteDataObject(
             Object.assign(new Collection(), {
               _links: {
-                'irrelevant': {
+                irrelevant: {
                   href: 'irrelevant link',
                 },
-                'adminGroup': {
+                adminGroup: {
                   href: 'adminGroup link',
                 },
-                'submittersGroup': {
+                submittersGroup: {
                   href: 'submittersGroup link',
                 },
-                'itemReadGroup': {
+                itemReadGroup: {
                   href: 'itemReadGroup link',
                 },
-                'bitstreamReadGroup': {
+                bitstreamReadGroup: {
                   href: 'bitstreamReadGroup link',
                 },
-                'workflowGroups/test': {
-                  href: 'test workflow group link',
-                },
+                workflowGroups: [
+                  {
+                    name: 'test',
+                    href: 'test workflow group link',
+                  },
+                ],
               },
-            }),
+            })
           ),
         })
       }
     };
 
     const requestService = {
-      hasByHrefObservable: () => observableOf(true),
+      hasByHref$: () => observableOf(true),
     };
 
     const groupDataService = {
-      findByHref: () => observableOf(new RemoteData(
-        false,
-        false,
-        true,
-        undefined,
-        {},
-        200,
-      )),
+      findByHref: () => createSuccessfulRemoteDataObject$({}),
     };
 
     TestBed.configureTestingModule({
diff --git a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
index 45f2f37b9bf..79122458690 100644
--- a/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -4,8 +4,8 @@ import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
-import { ComcolRole } from '../../../shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { HALLink } from '../../../core/shared/hal-link.model';
 
 /**
  * Component for managing a collection's roles
@@ -19,33 +19,14 @@ export class CollectionRolesComponent implements OnInit {
   dsoRD$: Observable<RemoteData<Collection>>;
 
   /**
-   * The collection to manage, as an observable.
+   * The different roles for the collection, as an observable.
    */
-  get collection$(): Observable<Collection> {
-    return this.dsoRD$.pipe(
-      getSucceededRemoteData(),
-      getRemoteDataPayload(),
-    )
-  }
+  comcolRoles$: Observable<HALLink[]>
 
   /**
-   * The different roles for the collection, as an observable.
+   * The collection to manage, as an observable.
    */
-  getComcolRoles(): Observable<ComcolRole[]> {
-    return this.collection$.pipe(
-      map((collection) =>
-        [
-          ComcolRole.COLLECTION_ADMIN,
-          ComcolRole.SUBMITTERS,
-          ComcolRole.ITEM_READ,
-          ComcolRole.BITSTREAM_READ,
-          ...Object.keys(collection._links)
-            .filter((link) => link.startsWith('workflowGroups/'))
-            .map((link) => new ComcolRole(link.substr('workflowGroups/'.length), link)),
-        ]
-      ),
-    );
-  }
+  collection$: Observable<Collection>
 
   constructor(
     protected route: ActivatedRoute,
@@ -57,5 +38,32 @@ export class CollectionRolesComponent implements OnInit {
       first(),
       map((data) => data.dso),
     );
+
+    this.collection$ = this.dsoRD$.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+
+    this.comcolRoles$ = this.collection$.pipe(
+      map((collection) => [
+        {
+          name: 'collection-admin',
+          href: collection._links.adminGroup.href,
+        },
+        {
+          name: 'submitters',
+          href: collection._links.submittersGroup.href,
+        },
+        {
+          name: 'item_read',
+          href: collection._links.itemReadGroup.href,
+        },
+        {
+          name: 'bitstream_read',
+          href: collection._links.bitstreamReadGroup.href,
+        },
+        ...collection._links.workflowGroups,
+      ]),
+    );
   }
 }
diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
index be72fd74387..5c00cb35d28 100644
--- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
@@ -17,9 +17,9 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { By } from '@angular/platform-browser';
 import { Collection } from '../../../core/shared/collection.model';
-import { RemoteData } from '../../../core/data/remote-data';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { RequestService } from '../../../core/data/request.service';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -111,7 +111,7 @@ describe('CollectionSourceComponent', () => {
       uuid: 'fake-collection-id'
     });
     collectionService = jasmine.createSpyObj('collectionService', {
-      getContentSource: observableOf(contentSource),
+      getContentSource: createSuccessfulRemoteDataObject$(contentSource),
       updateContentSource: observableOf(contentSource),
       getHarvesterEndpoint: observableOf('harvester-endpoint')
     });
@@ -125,7 +125,7 @@ describe('CollectionSourceComponent', () => {
         { provide: NotificationsService, useValue: notificationsService },
         { provide: Location, useValue: location },
         { provide: DynamicFormService, useValue: formService },
-        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: new RemoteData(false, false, true, null, collection) }) } } },
+        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
         { provide: Router, useValue: router },
         { provide: CollectionDataService, useValue: collectionService },
         { provide: RequestService, useValue: requestService }
diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 88b75014485..6ad6516f105 100644
--- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -27,7 +27,7 @@ import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/obj
 import { Subscription } from 'rxjs/internal/Subscription';
 import { cloneDeep } from 'lodash';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { MetadataConfig } from '../../../core/shared/metadata-config.model';
 import { INotification } from '../../../shared/notifications/models/notification.model';
 import { RequestService } from '../../../core/data/request.service';
@@ -255,12 +255,12 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     this.collectionRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso));
 
     this.collectionRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((col) => col.payload.uuid),
       switchMap((uuid) => this.collectionService.getContentSource(uuid)),
-      take(1)
-    ).subscribe((contentSource: ContentSource) => {
-      this.initializeOriginalContentSource(contentSource);
+      getFirstCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<ContentSource>) => {
+      this.initializeOriginalContentSource(rd.payload);
     });
 
     this.updateFieldTranslations();
@@ -376,7 +376,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
   onSubmit() {
     // Remove cached harvester request to allow for latest harvester to be displayed when switching tabs
     this.collectionRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((col) => col.payload.uuid),
       switchMap((uuid) => this.collectionService.getHarvesterEndpoint(uuid)),
       take(1)
@@ -384,7 +384,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
 
     // Update harvester
     this.collectionRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((col) => col.payload.uuid),
       switchMap((uuid) => this.collectionService.updateContentSource(uuid, this.contentSource)),
       take(1)
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
index 209ce5149a1..f225fc3e974 100644
--- a/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { EditComColPageComponent } from '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { Collection } from '../../core/shared/collection.model';
-import { getCollectionPageRoute } from '../collection-page-routing.module';
+import { getCollectionPageRoute } from '../collection-page-routing-paths';
 
 /**
  * Component that represents the page where a user can edit an existing Collection
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts b/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts
index f442aae4d68..6ca0948512b 100644
--- a/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts
+++ b/src/app/+collection-page/edit-collection-page/edit-collection-page.module.ts
@@ -8,6 +8,7 @@ import { CollectionPageModule } from '../collection-page.module';
 import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
 import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionSourceComponent } from './collection-source/collection-source.component';
+import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
 
 /**
  * Module that contains all components related to the Edit Collection page administrator functionality
@@ -24,7 +25,8 @@ import { CollectionSourceComponent } from './collection-source/collection-source
     CollectionMetadataComponent,
     CollectionRolesComponent,
     CollectionCurateComponent,
-    CollectionSourceComponent
+    CollectionSourceComponent,
+    CollectionAuthorizationsComponent
   ]
 })
 export class EditCollectionPageModule {
diff --git a/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts b/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts
index 0569de9cd9c..818f064104c 100644
--- a/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts
+++ b/src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts
@@ -5,7 +5,12 @@ import { CollectionMetadataComponent } from './collection-metadata/collection-me
 import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
 import { CollectionSourceComponent } from './collection-source/collection-source.component';
 import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
+import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
 
 /**
  * Routing module that handles the routing for the Edit Collection page administrator functionality
@@ -49,10 +54,46 @@ import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.r
             path: 'curate',
             component: CollectionCurateComponent,
             data: { title: 'collection.edit.tabs.curate.title', showBreadcrumbs: true }
+          },
+/*          {
+            path: 'authorizations',
+            component: CollectionAuthorizationsComponent,
+            data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true }
+          },*/
+          {
+            path: 'authorizations',
+            data: { showBreadcrumbs: true },
+            children: [
+              {
+                path: 'create',
+                resolve: {
+                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                },
+                component: ResourcePolicyCreateComponent,
+                data: { title: 'resource-policies.create.page.title' }
+              },
+              {
+                path: 'edit',
+                resolve: {
+                  resourcePolicy: ResourcePolicyResolver
+                },
+                component: ResourcePolicyEditComponent,
+                data: { title: 'resource-policies.edit.page.title' }
+              },
+              {
+                path: '',
+                component: CollectionAuthorizationsComponent,
+                data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true }
+              }
+            ]
           }
         ]
       }
     ])
+  ],
+  providers: [
+    ResourcePolicyResolver,
+    ResourcePolicyTargetResolver
   ]
 })
 export class EditCollectionPageRoutingModule {
diff --git a/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.html
new file mode 100644
index 00000000000..5b0f83fa223
--- /dev/null
+++ b/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -0,0 +1,9 @@
+<div class="container" *ngVar="(collectionRD$ | async)?.payload as collection">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: collection?.name } }}</h2>
+      <ds-item-metadata [updateService]="itemTemplateService"></ds-item-metadata>
+      <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
+    </div>
+  </div>
+</div>
diff --git a/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts b/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
new file mode 100644
index 00000000000..3cd2a7a6381
--- /dev/null
+++ b/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
@@ -0,0 +1,51 @@
+import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { SharedModule } from '../../shared/shared.module';
+import { RouterTestingModule } from '@angular/router/testing';
+import { CommonModule } from '@angular/common';
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
+import { ActivatedRoute } from '@angular/router';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { Collection } from '../../core/shared/collection.model';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { getCollectionEditRoute } from '../collection-page-routing-paths';
+
+describe('EditItemTemplatePageComponent', () => {
+  let comp: EditItemTemplatePageComponent;
+  let fixture: ComponentFixture<EditItemTemplatePageComponent>;
+  let itemTemplateService: ItemTemplateDataService;
+  let collection: Collection;
+
+  beforeEach(async(() => {
+    collection = Object.assign(new Collection(), {
+      uuid: 'collection-id',
+      id: 'collection-id',
+      name: 'Fake Collection'
+    });
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
+      declarations: [EditItemTemplatePageComponent],
+      providers: [
+        { provide: ItemTemplateDataService, useValue: {} },
+        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditItemTemplatePageComponent);
+    comp = fixture.componentInstance;
+    itemTemplateService = (comp as any).itemTemplateService;
+    fixture.detectChanges();
+  });
+
+  describe('getCollectionEditUrl', () => {
+    it('should return the collection\'s edit url', () => {
+      const url = comp.getCollectionEditUrl(collection);
+      expect(url).toEqual(getCollectionEditRoute(collection.uuid));
+    });
+  });
+});
diff --git a/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.ts
new file mode 100644
index 00000000000..ac8d9b47d46
--- /dev/null
+++ b/src/app/+collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -0,0 +1,44 @@
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { Collection } from '../../core/shared/collection.model';
+import { ActivatedRoute } from '@angular/router';
+import { first, map } from 'rxjs/operators';
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
+import { getCollectionEditRoute } from '../collection-page-routing-paths';
+
+@Component({
+  selector: 'ds-edit-item-template-page',
+  templateUrl: './edit-item-template-page.component.html',
+})
+/**
+ * Component for editing the item template of a collection
+ */
+export class EditItemTemplatePageComponent implements OnInit {
+
+  /**
+   * The collection to edit the item template for
+   */
+  collectionRD$: Observable<RemoteData<Collection>>;
+
+  constructor(protected route: ActivatedRoute,
+              public itemTemplateService: ItemTemplateDataService) {
+  }
+
+  ngOnInit(): void {
+    this.collectionRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso));
+  }
+
+  /**
+   * Get the URL to the collection's edit page
+   * @param collection
+   */
+  getCollectionEditUrl(collection: Collection): string {
+    if (collection) {
+      return getCollectionEditRoute(collection.uuid);
+    } else {
+      return '';
+    }
+  }
+
+}
diff --git a/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.spec.ts b/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
new file mode 100644
index 00000000000..bd54de7b88e
--- /dev/null
+++ b/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
@@ -0,0 +1,29 @@
+import { first } from 'rxjs/operators';
+import { ItemTemplatePageResolver } from './item-template-page.resolver';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+describe('ItemTemplatePageResolver', () => {
+  describe('resolve', () => {
+    let resolver: ItemTemplatePageResolver;
+    let itemTemplateService: any;
+    const uuid = '1234-65487-12354-1235';
+
+    beforeEach(() => {
+      itemTemplateService = {
+        findByCollectionID: (id: string) => createSuccessfulRemoteDataObject$({ id })
+      };
+      resolver = new ItemTemplatePageResolver(itemTemplateService);
+    });
+
+    it('should resolve an item template with the correct id', (done) => {
+      resolver.resolve({ params: { id: uuid } } as any, undefined)
+        .pipe(first())
+        .subscribe(
+          (resolved) => {
+            expect(resolved.payload.id).toEqual(uuid);
+            done();
+          }
+        );
+    });
+  });
+});
diff --git a/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.ts b/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.ts
new file mode 100644
index 00000000000..aeb92e98234
--- /dev/null
+++ b/src/app/+collection-page/edit-item-template-page/item-template-page.resolver.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+
+/**
+ * This class represents a resolver that requests a specific collection's item template before the route is activated
+ */
+@Injectable()
+export class ItemTemplatePageResolver implements Resolve<RemoteData<Item>> {
+  constructor(private itemTemplateService: ItemTemplateDataService) {
+  }
+
+  /**
+   * Method for resolving a collection's item template based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Collection>> Emits the found item template based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
+    return this.itemTemplateService.findByCollectionID(route.params.id, false, followLink('templateItemOf')).pipe(
+      getFirstCompletedRemoteData(),
+    );
+  }
+}
diff --git a/src/app/+community-page/community-page-administrator.guard.ts b/src/app/+community-page/community-page-administrator.guard.ts
new file mode 100644
index 00000000000..bb296a26fd5
--- /dev/null
+++ b/src/app/+community-page/community-page-administrator.guard.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Community } from '../core/shared/community.model';
+import { CommunityPageResolver } from './community-page.resolver';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { of as observableOf } from 'rxjs';
+import { DsoPageFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard';
+import { Observable } from 'rxjs/internal/Observable';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { AuthService } from '../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Community} pages requiring administrator rights
+ */
+export class CommunityPageAdministratorGuard extends DsoPageFeatureGuard<Community> {
+  constructor(protected resolver: CommunityPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/+community-page/community-page-routing-paths.ts b/src/app/+community-page/community-page-routing-paths.ts
new file mode 100644
index 00000000000..5884a2acf86
--- /dev/null
+++ b/src/app/+community-page/community-page-routing-paths.ts
@@ -0,0 +1,30 @@
+import { getCollectionPageRoute } from '../+collection-page/collection-page-routing-paths';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+
+export const COMMUNITY_PARENT_PARAMETER = 'parent';
+
+export const COMMUNITY_MODULE_PATH = 'communities';
+
+export function getCommunityModuleRoute() {
+  return `/${COMMUNITY_MODULE_PATH}`;
+}
+
+export function getCommunityPageRoute(communityId: string) {
+  return new URLCombiner(getCommunityModuleRoute(), communityId).toString();
+}
+
+export function getCommunityEditRoute(id: string) {
+  return new URLCombiner(getCommunityModuleRoute(), id, COMMUNITY_EDIT_PATH).toString()
+}
+
+export function getCommunityCreateRoute() {
+  return new URLCombiner(getCommunityModuleRoute(), COMMUNITY_CREATE_PATH).toString()
+}
+
+export function getCommunityEditRolesRoute(id) {
+  return new URLCombiner(getCollectionPageRoute(id), COMMUNITY_EDIT_PATH, COMMUNITY_EDIT_ROLES_PATH).toString()
+}
+
+export const COMMUNITY_CREATE_PATH = 'create';
+export const COMMUNITY_EDIT_PATH = 'edit';
+export const COMMUNITY_EDIT_ROLES_PATH = 'roles';
diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/+community-page/community-page-routing.module.ts
index 9922bc2c014..66a5a73198e 100644
--- a/src/app/+community-page/community-page-routing.module.ts
+++ b/src/app/+community-page/community-page-routing.module.ts
@@ -7,28 +7,13 @@ import { CreateCommunityPageComponent } from './create-community-page/create-com
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { CreateCommunityPageGuard } from './create-community-page/create-community-page.guard';
 import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getCommunityModulePath } from '../app-routing.module';
 import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
 import { LinkService } from '../core/cache/builders/link.service';
-
-export const COMMUNITY_PARENT_PARAMETER = 'parent';
-
-export function getCommunityPageRoute(communityId: string) {
-  return new URLCombiner(getCommunityModulePath(), communityId).toString();
-}
-
-export function getCommunityEditPath(id: string) {
-  return new URLCombiner(getCommunityModulePath(), id, COMMUNITY_EDIT_PATH).toString()
-}
-
-export function getCommunityCreatePath() {
-  return new URLCombiner(getCommunityModulePath(), COMMUNITY_CREATE_PATH).toString()
-}
-
-const COMMUNITY_CREATE_PATH = 'create';
-const COMMUNITY_EDIT_PATH = 'edit';
+import { COMMUNITY_EDIT_PATH, COMMUNITY_CREATE_PATH } from './community-page-routing-paths';
+import { CommunityPageAdministratorGuard } from './community-page-administrator.guard';
+import { MenuItemType } from '../shared/menu/initial-menus-state';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 
 @NgModule({
   imports: [
@@ -49,7 +34,7 @@ const COMMUNITY_EDIT_PATH = 'edit';
           {
             path: COMMUNITY_EDIT_PATH,
             loadChildren: './edit-community-page/edit-community-page.module#EditCommunityPageModule',
-            canActivate: [AuthenticatedGuard]
+            canActivate: [CommunityPageAdministratorGuard]
           },
           {
             path: 'delete',
@@ -62,7 +47,21 @@ const COMMUNITY_EDIT_PATH = 'edit';
             component: CommunityPageComponent,
             pathMatch: 'full',
           }
-        ]
+        ],
+        data: {
+          menu: {
+            public: [{
+              id: 'statistics_community_:id',
+              active: true,
+              visible: true,
+              model: {
+                type: MenuItemType.LINK,
+                text: 'menu.section.statistics',
+                link: 'statistics/communities/:id/',
+              } as LinkMenuItemModel,
+            }],
+          },
+        },
       },
     ])
   ],
@@ -71,7 +70,8 @@ const COMMUNITY_EDIT_PATH = 'edit';
     CommunityBreadcrumbResolver,
     DSOBreadcrumbsService,
     LinkService,
-    CreateCommunityPageGuard
+    CreateCommunityPageGuard,
+    CommunityPageAdministratorGuard
   ]
 })
 export class CommunityPageRoutingModule {
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index dfd1ce93d90..418e69ed107 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -2,24 +2,28 @@
   <div class="community-page" *ngIf="communityRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="communityRD?.payload; let communityPayload">
       <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
-      <header class="comcol-header border-bottom mb-4 pb-4">
-        <!-- Community name -->
-        <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
-        <!-- Community logo -->
-        <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
-        </ds-comcol-page-logo>
-        <!-- Handle -->
-        <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
-        </ds-comcol-page-handle>
-        <!-- Introductory text -->
-        <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
-        </ds-comcol-page-content>
-        <!-- News -->
-        <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
-          [title]="'community.page.news'">
-        </ds-comcol-page-content>
-
-      </header>
+      <div class="d-flex flex-row border-bottom mb-4 pb-4">
+        <header class="comcol-header mr-auto">
+          <!-- Community name -->
+          <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
+          <!-- Community logo -->
+          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
+          </ds-comcol-page-logo>
+          <!-- Handle -->
+          <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
+          </ds-comcol-page-handle>
+          <!-- Introductory text -->
+          <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
+          </ds-comcol-page-content>
+          <!-- News -->
+          <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
+            [title]="'community.page.news'">
+          </ds-comcol-page-content>
+        </header>
+        <div class="pl-2">
+          <ds-dso-page-edit-button [pageRoutePrefix]="'communities'" [dso]="communityPayload" [tooltipMsg]="'community.page.edit'"></ds-dso-page-edit-button>
+        </div>
+      </div>
       <section class="comcol-page-browse-section">
         <!-- Browse-By Links -->
         <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
diff --git a/src/app/+community-page/community-page.component.ts b/src/app/+community-page/community-page.component.ts
index 36218299277..e4812e65141 100644
--- a/src/app/+community-page/community-page.component.ts
+++ b/src/app/+community-page/community-page.component.ts
@@ -1,8 +1,8 @@
 import { mergeMap, filter, map } from 'rxjs/operators';
-import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { Subscription, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { RemoteData } from '../core/data/remote-data';
 import { Bitstream } from '../core/shared/bitstream.model';
@@ -13,7 +13,8 @@ import { MetadataService } from '../core/metadata/metadata.service';
 
 import { fadeInOut } from '../shared/animations/fade';
 import { hasValue } from '../shared/empty.util';
-import { redirectToPageNotFoundOn404 } from '../core/shared/operators';
+import { redirectOn4xx } from '../core/shared/operators';
+import { AuthService } from '../core/auth/auth.service';
 
 @Component({
   selector: 'ds-community-page',
@@ -39,7 +40,8 @@ export class CommunityPageComponent implements OnInit {
     private communityDataService: CommunityDataService,
     private metadata: MetadataService,
     private route: ActivatedRoute,
-    private router: Router
+    private router: Router,
+    private authService: AuthService,
   ) {
 
   }
@@ -47,7 +49,7 @@ export class CommunityPageComponent implements OnInit {
   ngOnInit(): void {
     this.communityRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Community>),
-      redirectToPageNotFoundOn404(this.router)
+      redirectOn4xx(this.router, this.authService)
     );
     this.logoRD$ = this.communityRD$.pipe(
       map((rd: RemoteData<Community>) => rd.payload),
diff --git a/src/app/+community-page/community-page.resolver.spec.ts b/src/app/+community-page/community-page.resolver.spec.ts
index aa6e9d9c1fd..e75f5ad57e8 100644
--- a/src/app/+community-page/community-page.resolver.spec.ts
+++ b/src/app/+community-page/community-page.resolver.spec.ts
@@ -1,6 +1,6 @@
-import { of as observableOf } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { CommunityPageResolver } from './community-page.resolver';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 
 describe('CommunityPageResolver', () => {
   describe('resolve', () => {
@@ -10,17 +10,18 @@ describe('CommunityPageResolver', () => {
 
     beforeEach(() => {
       communityService = {
-        findById: (id: string) => observableOf({ payload: { id }, hasSucceeded: true })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
       };
       resolver = new CommunityPageResolver(communityService);
     });
 
-    it('should resolve a community with the correct id', () => {
+    it('should resolve a community with the correct id', (done) => {
       resolver.resolve({ params: { id: uuid } } as any, undefined)
         .pipe(first())
         .subscribe(
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
+            done();
           }
         );
     });
diff --git a/src/app/+community-page/community-page.resolver.ts b/src/app/+community-page/community-page.resolver.ts
index 7696f7d4695..0f5538eec94 100644
--- a/src/app/+community-page/community-page.resolver.ts
+++ b/src/app/+community-page/community-page.resolver.ts
@@ -4,9 +4,8 @@ import { Observable } from 'rxjs';
 import { RemoteData } from '../core/data/remote-data';
 import { Community } from '../core/shared/community.model';
 import { CommunityDataService } from '../core/data/community-data.service';
-import { find } from 'rxjs/operators';
-import { hasValue } from '../shared/empty.util';
 import { followLink } from '../shared/utils/follow-link-config.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
  * This class represents a resolver that requests a specific community before the route is activated
@@ -26,11 +25,12 @@ export class CommunityPageResolver implements Resolve<RemoteData<Community>> {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Community>> {
     return this.communityService.findById(
       route.params.id,
+      false,
       followLink('logo'),
       followLink('subcommunities'),
       followLink('collections')
     ).pipe(
-      find((RD) => hasValue(RD.error) || RD.hasSucceeded)
+      getFirstCompletedRemoteData(),
     );
   }
 }
diff --git a/src/app/+community-page/create-community-page/create-community-page.component.spec.ts b/src/app/+community-page/create-community-page/create-community-page.component.spec.ts
index b4da0be4d11..c48e9158fb1 100644
--- a/src/app/+community-page/create-community-page/create-community-page.component.spec.ts
+++ b/src/app/+community-page/create-community-page/create-community-page.component.spec.ts
@@ -12,6 +12,7 @@ import { CommunityDataService } from '../../core/data/community-data.service';
 import { CreateCommunityPageComponent } from './create-community-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import {RequestService} from '../../core/data/request.service';
 
 describe('CreateCommunityPageComponent', () => {
   let comp: CreateCommunityPageComponent;
@@ -25,7 +26,8 @@ describe('CreateCommunityPageComponent', () => {
         { provide: CommunityDataService, useValue: { findById: () => observableOf({}) } },
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: RequestService, useValue: {} }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+community-page/create-community-page/create-community-page.component.ts b/src/app/+community-page/create-community-page/create-community-page.component.ts
index 30a2acbb0d8..f9ed09f1cdb 100644
--- a/src/app/+community-page/create-community-page/create-community-page.component.ts
+++ b/src/app/+community-page/create-community-page/create-community-page.component.ts
@@ -6,6 +6,7 @@ import { Router } from '@angular/router';
 import { CreateComColPageComponent } from '../../shared/comcol-forms/create-comcol-page/create-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import {RequestService} from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can create a new Community
@@ -24,8 +25,9 @@ export class CreateCommunityPageComponent extends CreateComColPageComponent<Comm
     protected routeService: RouteService,
     protected router: Router,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
+    protected requestService: RequestService
   ) {
-    super(communityDataService, communityDataService, routeService, router, notificationsService, translate);
+    super(communityDataService, communityDataService, routeService, router, notificationsService, translate, requestService);
   }
 }
diff --git a/src/app/+community-page/create-community-page/create-community-page.guard.spec.ts b/src/app/+community-page/create-community-page/create-community-page.guard.spec.ts
index 22e88122889..ac0b196c724 100644
--- a/src/app/+community-page/create-community-page/create-community-page.guard.spec.ts
+++ b/src/app/+community-page/create-community-page/create-community-page.guard.spec.ts
@@ -2,7 +2,10 @@ import { CreateCommunityPageGuard } from './create-community-page.guard';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { Community } from '../../core/shared/community.model';
 import { first } from 'rxjs/operators';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
 
 describe('CreateCommunityPageGuard', () => {
   describe('canActivate', () => {
@@ -18,7 +21,7 @@ describe('CreateCommunityPageGuard', () => {
           } else if (id === 'invalid-id') {
             return createSuccessfulRemoteDataObject$(undefined);
           } else if (id === 'error-id') {
-            return createFailedRemoteDataObject$(new Community());
+            return createFailedRemoteDataObject$('not found', 404);
           }
         }
       };
diff --git a/src/app/+community-page/create-community-page/create-community-page.guard.ts b/src/app/+community-page/create-community-page/create-community-page.guard.ts
index 2ee5cb6064d..835fbb65891 100644
--- a/src/app/+community-page/create-community-page/create-community-page.guard.ts
+++ b/src/app/+community-page/create-community-page/create-community-page.guard.ts
@@ -5,9 +5,9 @@ import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
-import { getFinishedRemoteData } from '../../core/shared/operators';
 import { map, tap } from 'rxjs/operators';
 import { Observable, of as observableOf } from 'rxjs';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 
 /**
  * Prevent creation of a community with an invalid parent community provided
@@ -29,18 +29,16 @@ export class CreateCommunityPageGuard implements CanActivate {
       return observableOf(true);
     }
 
-    const parent: Observable<RemoteData<Community>> = this.communityService.findById(parentID)
+    return this.communityService.findById(parentID)
       .pipe(
-        getFinishedRemoteData(),
-      );
-
-    return parent.pipe(
-      map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)),
-      tap((isValid: boolean) => {
-        if (!isValid) {
-          this.router.navigate(['/404']);
+        getFirstCompletedRemoteData(),
+        map((communityRD: RemoteData<Community>) => hasValue(communityRD) && communityRD.hasSucceeded && hasValue(communityRD.payload)),
+        tap((isValid: boolean) => {
+          if (!isValid) {
+            this.router.navigate(['/404']);
+          }
         }
-      })
+      )
     );
   }
 }
diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts b/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts
index 613be9deb3f..6c5f29b4b5b 100644
--- a/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts
+++ b/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts
@@ -9,6 +9,7 @@ import { CommunityDataService } from '../../core/data/community-data.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SharedModule } from '../../shared/shared.module';
 import { DeleteCommunityPageComponent } from './delete-community-page.component';
+import {RequestService} from '../../core/data/request.service';
 
 describe('DeleteCommunityPageComponent', () => {
   let comp: DeleteCommunityPageComponent;
@@ -22,6 +23,7 @@ describe('DeleteCommunityPageComponent', () => {
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } },
         { provide: NotificationsService, useValue: {} },
+        { provide: RequestService, useValue: {}}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.ts b/src/app/+community-page/delete-community-page/delete-community-page.component.ts
index 9f1465a3c7a..ec51076bbc8 100644
--- a/src/app/+community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/+community-page/delete-community-page/delete-community-page.component.ts
@@ -5,6 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { DeleteComColPageComponent } from '../../shared/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import {RequestService} from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can delete an existing Community
@@ -22,8 +23,10 @@ export class DeleteCommunityPageComponent extends DeleteComColPageComponent<Comm
     protected router: Router,
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
+    protected requestService: RequestService
   ) {
-    super(dsoDataService, router, route, notifications, translate);
+    super(dsoDataService, router, route, notifications, translate, requestService);
   }
+
 }
diff --git a/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.html b/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.html
new file mode 100644
index 00000000000..abf2f871414
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.html
@@ -0,0 +1,3 @@
+<div class="container">
+  <ds-resource-policies [resourceType]="'community'" [resourceUUID]="(dsoRD$ | async)?.payload?.id"></ds-resource-policies>
+</div>
diff --git a/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts b/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
new file mode 100644
index 00000000000..dd10bdce29f
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
@@ -0,0 +1,73 @@
+import { CommonModule } from '@angular/common';
+import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CommunityAuthorizationsComponent } from './community-authorizations.component';
+import { Collection } from '../../../core/shared/collection.model';
+
+describe('CommunityAuthorizationsComponent', () => {
+  let comp: CommunityAuthorizationsComponent<DSpaceObject>;
+  let fixture: ComponentFixture<CommunityAuthorizationsComponent<any>>;
+
+  const community = Object.assign(new Collection(), {
+    uuid: 'community',
+    id: 'community',
+    _links: {
+      self: { href: 'community-selflink' }
+    }
+  });
+
+  const communityRD = createSuccessfulRemoteDataObject(community);
+
+  const routeStub = {
+    parent: {
+      parent: {
+        data: observableOf({
+          dso: communityRD
+        })
+      }
+    }
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule
+      ],
+      declarations: [CommunityAuthorizationsComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        ChangeDetectorRef,
+        CommunityAuthorizationsComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityAuthorizationsComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    comp = null;
+    fixture.destroy();
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should init dso remote data properly', (done) => {
+    const expected = cold('(a|)', { a: communityRD });
+    expect(comp.dsoRD$).toBeObservable(expected);
+    done();
+  });
+});
diff --git a/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.ts b/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
new file mode 100644
index 00000000000..8b241af667d
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
@@ -0,0 +1,38 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { DSpaceObject } from 'src/app/core/shared/dspace-object.model';
+
+@Component({
+  selector: 'ds-community-authorizations',
+  templateUrl: './community-authorizations.component.html',
+})
+/**
+ * Component that handles the community Authorizations
+ */
+export class CommunityAuthorizationsComponent<TDomain extends DSpaceObject> implements OnInit {
+
+  /**
+   * The initial DSO object
+   */
+  public dsoRD$: Observable<RemoteData<TDomain>>;
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {ActivatedRoute} route
+   */
+  constructor(
+    private route: ActivatedRoute
+  ) {
+  }
+
+  /**
+   * Initialize the component, setting up the community
+   */
+  ngOnInit(): void {
+    this.dsoRD$ = this.route.parent.parent.data.pipe(first(), map((data) => data.dso));
+  }
+}
diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.html b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.html
index e69de29bb2d..6c041d17253 100644
--- a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.html
+++ b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.html
@@ -0,0 +1,6 @@
+<div class="container">
+    <h3>{{'community.curate.header' |translate:{community: (communityName$ |async)} }}</h3>
+    <ds-curation-form
+           [dsoHandle]="(dsoRD$|async)?.payload.handle"
+    ></ds-curation-form>
+</div>
diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.spec.ts b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.spec.ts
new file mode 100644
index 00000000000..3217fee3c10
--- /dev/null
+++ b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.spec.ts
@@ -0,0 +1,69 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
+import { of as observableOf } from 'rxjs';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { ActivatedRoute } from '@angular/router';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CommunityCurateComponent } from './community-curate.component';
+import { Community } from '../../../core/shared/community.model';
+
+describe('CommunityCurateComponent', () => {
+  let comp: CommunityCurateComponent;
+  let fixture: ComponentFixture<CommunityCurateComponent>;
+  let debugEl: DebugElement;
+
+  let routeStub;
+  let dsoNameService;
+
+  const community = Object.assign(new Community(), {
+    metadata: {'dc.title': ['Community Name'], 'dc.identifier.uri': [ { value: '123456789/1'}]}
+  });
+
+  beforeEach(async(() => {
+    routeStub = {
+      parent: {
+        data: observableOf({
+          dso: createSuccessfulRemoteDataObject(community)
+        })
+      }
+    };
+
+    dsoNameService = jasmine.createSpyObj('dsoNameService', {
+      getName: 'Community Name'
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [CommunityCurateComponent],
+      providers: [
+        {provide: ActivatedRoute, useValue: routeStub},
+        {provide: DSONameService, useValue: dsoNameService}
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityCurateComponent);
+    comp = fixture.componentInstance;
+    debugEl = fixture.debugElement;
+
+    fixture.detectChanges();
+  });
+  describe('init', () => {
+    it('should initialise the comp', () => {
+      expect(comp).toBeDefined();
+      expect(debugEl.nativeElement.innerHTML).toContain('ds-curation-form');
+    });
+    it('should contain the community information provided in the route', () => {
+      comp.dsoRD$.subscribe((value) => {
+        expect(value.payload.handle
+        ).toEqual('123456789/1');
+      });
+      comp.communityName$.subscribe((value) => {
+        expect(value).toEqual('Community Name');
+      });
+    });
+  });
+});
diff --git a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts
index 6151d3fe9ad..5954b3e95ec 100644
--- a/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts
+++ b/src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts
@@ -1,4 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { Community } from '../../../core/shared/community.model';
+import { ActivatedRoute } from '@angular/router';
+import { map, take } from 'rxjs/operators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Observable } from 'rxjs';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../shared/empty.util';
+import { filter } from 'rxjs/internal/operators/filter';
 
 /**
  * Component for managing a community's curation tasks
@@ -7,6 +15,29 @@ import { Component } from '@angular/core';
   selector: 'ds-community-curate',
   templateUrl: './community-curate.component.html',
 })
-export class CommunityCurateComponent {
-  /* TODO: Implement Community Edit - Curate */
+export class CommunityCurateComponent implements OnInit {
+
+  dsoRD$: Observable<RemoteData<Community>>;
+  communityName$: Observable<string>;
+
+  constructor(
+    private route: ActivatedRoute,
+    private dsoNameService: DSONameService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.dsoRD$ = this.route.parent.data.pipe(
+      take(1),
+      map((data) => data.dso),
+    );
+
+    this.communityName$ = this.dsoRD$.pipe(
+      filter((rd: RemoteData<Community>) => hasValue(rd)),
+      map((rd: RemoteData<Community>) => {
+        return this.dsoNameService.getName(rd.payload);
+      })
+    );
+  }
+
 }
diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html
index 231645a6a5a..07d5d96fcd2 100644
--- a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html
+++ b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.html
@@ -1,5 +1,5 @@
 <ds-comcol-role
-  *ngFor="let comcolRole of getComcolRoles()"
+  *ngFor="let comcolRole of getComcolRoles$() | async"
   [dso]="community$ | async"
   [comcolRole]="comcolRole"
 >
diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.spec.ts b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.spec.ts
index 4894046b10a..87a1826a7d5 100644
--- a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.spec.ts
+++ b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.spec.ts
@@ -11,6 +11,7 @@ import { RequestService } from '../../../core/data/request.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 describe('CommunityRolesComponent', () => {
 
@@ -23,11 +24,7 @@ describe('CommunityRolesComponent', () => {
     const route = {
       parent: {
         data: observableOf({
-          dso: new RemoteData(
-            false,
-            false,
-            true,
-            undefined,
+          dso: createSuccessfulRemoteDataObject(
             Object.assign(new Community(), {
               _links: {
                 irrelevant: {
@@ -37,25 +34,18 @@ describe('CommunityRolesComponent', () => {
                   href: 'adminGroup link',
                 },
               },
-            }),
+            })
           ),
         })
       }
     };
 
     const requestService = {
-      hasByHrefObservable: () => observableOf(true),
+      hasByHref$: () => observableOf(true),
     };
 
     const groupDataService = {
-      findByHref: () => observableOf(new RemoteData(
-        false,
-        false,
-        true,
-        undefined,
-        {},
-        200,
-      )),
+      findByHref: () => createSuccessfulRemoteDataObject$({}),
     };
 
     TestBed.configureTestingModule({
diff --git a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts
index 336a56a5847..ec507907e3d 100644
--- a/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts
+++ b/src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -3,9 +3,9 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 import { Community } from '../../../core/shared/community.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
-import { ComcolRole } from '../../../shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
+import { HALLink } from '../../../core/shared/hal-link.model';
 
 /**
  * Component for managing a community's roles
@@ -23,7 +23,7 @@ export class CommunityRolesComponent implements OnInit {
    */
   get community$(): Observable<Community> {
     return this.dsoRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     )
   }
@@ -31,10 +31,15 @@ export class CommunityRolesComponent implements OnInit {
   /**
    * The different roles for the community.
    */
-  getComcolRoles(): ComcolRole[] {
-    return [
-      ComcolRole.COMMUNITY_ADMIN,
-    ];
+  getComcolRoles$(): Observable<HALLink[]> {
+    return this.community$.pipe(
+      map((community) => [
+        {
+          name: 'community-admin',
+          href: community._links.adminGroup.href,
+        },
+      ]),
+    );
   }
 
   constructor(
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.component.ts b/src/app/+community-page/edit-community-page/edit-community-page.component.ts
index c0adfe0ff1f..b8bf3a08acb 100644
--- a/src/app/+community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/+community-page/edit-community-page/edit-community-page.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { Community } from '../../core/shared/community.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { EditComColPageComponent } from '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component';
-import { getCommunityPageRoute } from '../community-page-routing.module';
+import { getCommunityPageRoute } from '../community-page-routing-paths';
 
 /**
  * Component that represents the page where a user can edit an existing Community
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.module.ts b/src/app/+community-page/edit-community-page/edit-community-page.module.ts
index f9a1e11a143..9c4a97eb5eb 100644
--- a/src/app/+community-page/edit-community-page/edit-community-page.module.ts
+++ b/src/app/+community-page/edit-community-page/edit-community-page.module.ts
@@ -7,6 +7,7 @@ import { EditCommunityPageComponent } from './edit-community-page.component';
 import { CommunityCurateComponent } from './community-curate/community-curate.component';
 import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
+import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
 
 /**
  * Module that contains all components related to the Edit Community page administrator functionality
@@ -22,7 +23,8 @@ import { CommunityRolesComponent } from './community-roles/community-roles.compo
     EditCommunityPageComponent,
     CommunityCurateComponent,
     CommunityMetadataComponent,
-    CommunityRolesComponent
+    CommunityRolesComponent,
+    CommunityAuthorizationsComponent
   ]
 })
 export class EditCommunityPageModule {
diff --git a/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts b/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts
index 3197e00829e..440fa01a308 100644
--- a/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts
+++ b/src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts
@@ -1,4 +1,3 @@
-import { CommunityPageResolver } from '../community-page.resolver';
 import { EditCommunityPageComponent } from './edit-community-page.component';
 import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
@@ -6,6 +5,11 @@ import { CommunityMetadataComponent } from './community-metadata/community-metad
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
 import { CommunityCurateComponent } from './community-curate/community-curate.component';
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
 
 /**
  * Routing module that handles the routing for the Edit Community page administrator functionality
@@ -44,11 +48,47 @@ import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.r
             path: 'curate',
             component: CommunityCurateComponent,
             data: { title: 'community.edit.tabs.curate.title', showBreadcrumbs: true }
+          },
+          /*{
+            path: 'authorizations',
+            component: CommunityAuthorizationsComponent,
+            data: { title: 'community.edit.tabs.authorizations.title', showBreadcrumbs: true }
+          },*/
+          {
+            path: 'authorizations',
+            data: { showBreadcrumbs: true },
+            children: [
+              {
+                path: 'create',
+                resolve: {
+                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                },
+                component: ResourcePolicyCreateComponent,
+                data: { title: 'resource-policies.create.page.title' }
+              },
+              {
+                path: 'edit',
+                resolve: {
+                  resourcePolicy: ResourcePolicyResolver
+                },
+                component: ResourcePolicyEditComponent,
+                data: { title: 'resource-policies.edit.page.title' }
+              },
+              {
+                path: '',
+                component: CommunityAuthorizationsComponent,
+                data: { title: 'community.edit.tabs.authorizations.title', showBreadcrumbs: true, hideReturnButton: true }
+              }
+            ]
           }
         ]
       }
     ])
   ],
+  providers: [
+    ResourcePolicyResolver,
+    ResourcePolicyTargetResolver
+  ]
 })
 export class EditCommunityPageRoutingModule {
 
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
index 060c5109b0f..1f02858b6e2 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
@@ -13,7 +13,7 @@ import { SharedModule } from '../../shared/shared.module';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { FindListOptions } from '../../core/data/request.models';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { HostWindowService } from '../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
@@ -105,7 +105,7 @@ describe('CommunityPageSubCollectionList Component', () => {
       if (endPageIndex > subCollList.length) {
         endPageIndex = subCollList.length;
       }
-      return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), subCollList.slice(startPageIndex, endPageIndex)));
+      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCollList.slice(startPageIndex, endPageIndex)));
 
     }
   };
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index 64c274444e2..261ae41aa27 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,16 +1,16 @@
 import { Component, Input, OnInit } from '@angular/core';
 
 import { BehaviorSubject } from 'rxjs';
-import { take } from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
 import { Community } from '../../core/shared/community.model';
 import { fadeIn } from '../../shared/animations/fade';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
+import { takeUntilCompletedRemoteData } from '../../core/shared/operators';
 
 @Component({
   selector: 'ds-community-page-sub-collection-list',
@@ -72,7 +72,7 @@ export class CommunityPageSubCollectionListComponent implements OnInit {
       currentPage: this.config.currentPage,
       elementsPerPage: this.config.pageSize,
       sort: { field: this.sortConfig.field, direction: this.sortConfig.direction }
-    }).pipe(take(1)).subscribe((results) => {
+    }).pipe(takeUntilCompletedRemoteData()).subscribe((results) => {
       this.subCollectionsRDObs.next(results);
     });
   }
diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
index 363a6526d3e..0c88a5c01d1 100644
--- a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
+++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
@@ -9,7 +9,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
 import { Community } from '../../core/shared/community.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { SharedModule } from '../../shared/shared.module';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -106,7 +106,7 @@ describe('CommunityPageSubCommunityListComponent Component', () => {
       if (endPageIndex > subCommList.length) {
         endPageIndex = subCommList.length;
       }
-      return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), subCommList.slice(startPageIndex, endPageIndex)));
+      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCommList.slice(startPageIndex, endPageIndex)));
 
     }
   };
diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts
index 1bd664021ee..c9f72fbc040 100644
--- a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,15 +1,15 @@
 import { Component, Input, OnInit } from '@angular/core';
 
 import { BehaviorSubject } from 'rxjs';
-import { take } from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
 import { fadeIn } from '../../shared/animations/fade';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
+import { takeUntilCompletedRemoteData } from '../../core/shared/operators';
 
 @Component({
   selector: 'ds-community-page-sub-community-list',
@@ -75,7 +75,7 @@ export class CommunityPageSubCommunityListComponent implements OnInit {
       currentPage: this.config.currentPage,
       elementsPerPage: this.config.pageSize,
       sort: { field: this.sortConfig.field, direction: this.sortConfig.direction }
-    }).pipe(take(1)).subscribe((results) => {
+    }).pipe(takeUntilCompletedRemoteData()).subscribe((results) => {
       this.subCommunitiesRDObs.next(results);
     });
   }
diff --git a/src/app/+home-page/home-page-routing.module.ts b/src/app/+home-page/home-page-routing.module.ts
index 78da529906e..c94df566436 100644
--- a/src/app/+home-page/home-page-routing.module.ts
+++ b/src/app/+home-page/home-page-routing.module.ts
@@ -3,6 +3,8 @@ import { RouterModule } from '@angular/router';
 
 import { HomePageComponent } from './home-page.component';
 import { HomePageResolver } from './home-page.resolver';
+import { MenuItemType } from '../shared/menu/initial-menus-state';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 
 @NgModule({
   imports: [
@@ -11,7 +13,21 @@ import { HomePageResolver } from './home-page.resolver';
         path: '',
         component: HomePageComponent,
         pathMatch: 'full',
-        data: {title: 'home.title'},
+        data: {
+          title: 'home.title',
+          menu: {
+            public: [{
+              id: 'statistics_site',
+              active: true,
+              visible: true,
+              model: {
+                type: MenuItemType.LINK,
+                text: 'menu.section.statistics',
+                link: 'statistics',
+              } as LinkMenuItemModel,
+            }],
+          },
+        },
         resolve: {
           site: HomePageResolver
         }
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts
index 4ffa70ae8d5..a97aac6b9ee 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts
@@ -9,7 +9,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { TopLevelCommunityListComponent } from './top-level-community-list.component';
 import { Community } from '../../core/shared/community.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { SharedModule } from '../../shared/shared.module';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -96,7 +96,7 @@ describe('TopLevelCommunityList Component', () => {
       if (endPageIndex > topCommList.length) {
         endPageIndex = topCommList.length;
       }
-      return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), topCommList.slice(startPageIndex, endPageIndex)));
+      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), topCommList.slice(startPageIndex, endPageIndex)));
 
     }
   };
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
index 02c3cb54a0b..b0892440080 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,15 +1,15 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, OnDestroy } from '@angular/core';
 
-import { BehaviorSubject } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { BehaviorSubject, Subscription } from 'rxjs';
 
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
 import { fadeInOut } from '../../shared/animations/fade';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * this component renders the Top-Level Community list
@@ -22,7 +22,7 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
   animations: [fadeInOut]
 })
 
-export class TopLevelCommunityListComponent implements OnInit {
+export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
   /**
    * A list of remote data objects of all top communities
    */
@@ -43,6 +43,11 @@ export class TopLevelCommunityListComponent implements OnInit {
    */
   sortConfig: SortOptions;
 
+  /**
+   * The subscription to the observable for the current page.
+   */
+  currentPageSubscription: Subscription;
+
   constructor(private cds: CommunityDataService) {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
@@ -71,12 +76,29 @@ export class TopLevelCommunityListComponent implements OnInit {
    * Update the list of top communities
    */
   updatePage() {
-    this.cds.findTop({
+    this.unsubscribe();
+    this.currentPageSubscription = this.cds.findTop({
       currentPage: this.config.currentPage,
       elementsPerPage: this.config.pageSize,
       sort: { field: this.sortConfig.field, direction: this.sortConfig.direction }
-    }).pipe(take(1)).subscribe((results) => {
+    }).subscribe((results) => {
       this.communitiesRD$.next(results);
     });
   }
+
+  /**
+   * Unsubscribe the top list subscription if it exists
+   */
+  private unsubscribe() {
+    if (hasValue(this.currentPageSubscription)) {
+      this.currentPageSubscription.unsubscribe();
+    }
+  }
+
+  /**
+   * Clean up subscriptions when the component is destroyed
+   */
+  ngOnDestroy() {
+    this.unsubscribe();
+  }
 }
diff --git a/src/app/+import-external-page/import-external-page.component.html b/src/app/+import-external-page/import-external-page.component.html
new file mode 100644
index 00000000000..5edccd55cb9
--- /dev/null
+++ b/src/app/+import-external-page/import-external-page.component.html
@@ -0,0 +1 @@
+<ds-submission-import-external></ds-submission-import-external>
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.scss b/src/app/+import-external-page/import-external-page.component.scss
similarity index 100%
rename from src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.scss
rename to src/app/+import-external-page/import-external-page.component.scss
diff --git a/src/app/+import-external-page/import-external-page.component.spec.ts b/src/app/+import-external-page/import-external-page.component.spec.ts
new file mode 100644
index 00000000000..5a2b7c5f8ef
--- /dev/null
+++ b/src/app/+import-external-page/import-external-page.component.spec.ts
@@ -0,0 +1,26 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ImportExternalPageComponent } from './import-external-page.component';
+
+describe('ImportExternalPageComponent', () => {
+  let component: ImportExternalPageComponent;
+  let fixture: ComponentFixture<ImportExternalPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ImportExternalPageComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ImportExternalPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create ImportExternalPageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/+import-external-page/import-external-page.component.ts b/src/app/+import-external-page/import-external-page.component.ts
new file mode 100644
index 00000000000..00709dad164
--- /dev/null
+++ b/src/app/+import-external-page/import-external-page.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component representing the external import page of the submission.
+ */
+@Component({
+  selector: 'ds-import-external-page',
+  templateUrl: './import-external-page.component.html',
+  styleUrls: ['./import-external-page.component.scss']
+})
+export class ImportExternalPageComponent {
+
+}
diff --git a/src/app/+import-external-page/import-external-page.module.ts b/src/app/+import-external-page/import-external-page.module.ts
new file mode 100644
index 00000000000..017c723ad9d
--- /dev/null
+++ b/src/app/+import-external-page/import-external-page.module.ts
@@ -0,0 +1,29 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../shared/shared.module';
+import { CoreModule } from '../core/core.module';
+import { ImportExternalRoutingModule } from './import-external-routing.module';
+import { SubmissionModule } from '../submission/submission.module';
+import { ImportExternalPageComponent } from './import-external-page.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CoreModule.forRoot(),
+    ImportExternalRoutingModule,
+    SubmissionModule,
+  ],
+  declarations: [
+    ImportExternalPageComponent
+  ],
+  entryComponents: [ ]
+})
+
+/**
+ * This module handles all components that are necessary for the submission external import page
+ */
+export class ImportExternalPageModule {
+
+}
diff --git a/src/app/+import-external-page/import-external-routing.module.ts b/src/app/+import-external-page/import-external-routing.module.ts
new file mode 100644
index 00000000000..91cdbf98779
--- /dev/null
+++ b/src/app/+import-external-page/import-external-routing.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { SubmissionImportExternalComponent } from '../submission/import-external/submission-import-external.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: '',
+        component: SubmissionImportExternalComponent,
+        pathMatch: 'full',
+        data: {
+          title: 'submission.import-external.page.title'
+        }
+      }
+    ])
+  ],
+  providers: [ ]
+})
+export class ImportExternalRoutingModule {
+
+}
diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts b/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts
index b86a9e88cbe..5d71b547416 100644
--- a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts
+++ b/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts
@@ -16,7 +16,10 @@ import { Bitstream } from '../../../core/shared/bitstream.model';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { RequestService } from '../../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
@@ -192,7 +195,7 @@ describe('UploadBistreamComponent', () => {
   function createUploadBitstreamTestingModule(queryParams) {
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject(mockItem)
+        dso: createSuccessfulRemoteDataObject(mockItem)
       }),
       queryParams: observableOf(queryParams),
       snapshot: {
diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts
index 536fc0931ff..68d9ed7d8da 100644
--- a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts
+++ b/src/app/+item-page/bitstreams/upload/upload-bitstream.component.ts
@@ -11,16 +11,16 @@ import { ItemDataService } from '../../../core/data/item-data.service';
 import { AuthService } from '../../../core/auth/auth.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { getBitstreamModulePath } from '../../../app-routing.module';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import {
   getFirstSucceededRemoteDataPayload
 } from '../../../core/shared/operators';
 import { UploaderComponent } from '../../../shared/uploader/uploader.component';
-import { getItemEditPath } from '../../item-page-routing.module';
 import { RequestService } from '../../../core/data/request.service';
+import { getBitstreamModuleRoute } from '../../../app-routing-paths';
+import { getItemEditRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-upload-bitstream',
@@ -103,7 +103,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
    */
   ngOnInit(): void {
     this.itemId = this.route.snapshot.params.id;
-    this.itemRD$ = this.route.data.pipe(map((data) => data.item));
+    this.itemRD$ = this.route.data.pipe(map((data) => data.dso));
     this.bundlesRD$ = this.itemRD$.pipe(
       switchMap((itemRD: RemoteData<Item>) => itemRD.payload.bundles)
     );
@@ -171,7 +171,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
 
     // Bring over the item ID as a query parameter
     const queryParams = { itemId: this.itemId };
-    this.router.navigate([getBitstreamModulePath(), bitstream.id, 'edit'], { queryParams: queryParams });
+    this.router.navigate([getBitstreamModuleRoute(), bitstream.id, 'edit'], { queryParams: queryParams });
   }
 
   /**
@@ -196,7 +196,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
    * When cancel is clicked, navigate back to the item's edit bitstreams page
    */
   onCancel() {
-    this.router.navigate([getItemEditPath(this.itemId), 'bitstreams']);
+    this.router.navigate([getItemEditRoute(this.itemId), 'bitstreams']);
   }
 
   /**
diff --git a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 503759eeff6..f3055d3e515 100644
--- a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -11,6 +11,7 @@ import { first, map } from 'rxjs/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
 import { environment } from '../../../../environments/environment';
+import { combineLatest as observableCombineLatest } from 'rxjs';
 
 @Component({
   selector: 'ds-abstract-item-update',
@@ -45,11 +46,12 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    * Initialize common properties between item-update components
    */
   ngOnInit(): void {
-    this.route.parent.data.pipe(map((data) => data.item))
-      .pipe(
-        first(),
-        map((data: RemoteData<Item>) => data.payload)
-      ).subscribe((item: Item) => {
+    observableCombineLatest(this.route.data, this.route.parent.data).pipe(
+      map(([data, parentData]) => Object.assign({}, data, parentData)),
+      map((data) => data.dso),
+      first(),
+      map((data: RemoteData<Item>) => data.payload)
+    ).subscribe((item: Item) => {
       this.item = item;
       this.postItemInit();
     });
@@ -121,7 +123,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
   /**
    * Check if the current page is entirely valid
    */
-  protected isValid() {
+  public isValid() {
     return this.objectUpdatesService.isValidPage(this.url);
   }
 
diff --git a/src/app/+item-page/edit-item-page/edit-item-operators.spec.ts b/src/app/+item-page/edit-item-page/edit-item-operators.spec.ts
index 98e2b774666..e7bd5b98ce9 100644
--- a/src/app/+item-page/edit-item-page/edit-item-operators.spec.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-operators.spec.ts
@@ -6,6 +6,7 @@ import {
   createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject
 } from '../../shared/remote-data.utils';
+import { isNotEmpty } from '../../shared/empty.util';
 
 describe('findSuccessfulAccordingTo', () => {
   let mockItem1;
@@ -19,12 +20,12 @@ describe('findSuccessfulAccordingTo', () => {
     mockItem2 = new Item();
     mockItem1.isWithdrawn = false;
 
-    predicate = (rd: RemoteData<Item>) => rd.payload.isWithdrawn;
+    predicate = (rd: RemoteData<Item>) => isNotEmpty(rd.payload) ? rd.payload.isWithdrawn : false;
   });
   it('should return first successful RemoteData Observable that complies to predicate', () => {
     const testRD = {
       a: createSuccessfulRemoteDataObject(undefined),
-      b: createFailedRemoteDataObject(mockItem1),
+      b: createFailedRemoteDataObject(),
       c: createSuccessfulRemoteDataObject(mockItem2),
       d: createSuccessfulRemoteDataObject(mockItem1),
       e: createSuccessfulRemoteDataObject(mockItem2),
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.ts b/src/app/+item-page/edit-item-page/edit-item-page.component.ts
index eafc04ae0b4..2bd9a30ca30 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.component.ts
@@ -6,7 +6,7 @@ import { Item } from '../../core/shared/item.model';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { isNotEmpty } from '../../shared/empty.util';
-import { getItemPageRoute } from '../item-page-routing.module';
+import { getItemPageRoute } from '../item-page-routing-paths';
 
 @Component({
   selector: 'ds-edit-item-page',
@@ -47,7 +47,7 @@ export class EditItemPageComponent implements OnInit {
     this.pages = this.route.routeConfig.children
       .map((child: any) => child.path)
       .filter((path: string) => isNotEmpty(path)); // ignore reroutes
-    this.itemRD$ = this.route.data.pipe(map((data) => data.item));
+    this.itemRD$ = this.route.data.pipe(map((data) => data.dso));
   }
 
   /**
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
index ac6125fb1c8..17010acab41 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
@@ -29,6 +29,8 @@ import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edi
 import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
 import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component';
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
+import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
+import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -67,9 +69,14 @@ import { ItemVersionHistoryComponent } from './item-version-history/item-version
     ItemMoveComponent,
     ItemEditBitstreamDragHandleComponent,
     VirtualMetadataComponent,
+    ItemAuthorizationsComponent
   ],
   providers: [
-    BundleDataService
+    BundleDataService,
+    ObjectValuesPipe
+  ],
+  exports: [
+    ItemMetadataComponent
   ]
 })
 export class EditItemPageModule {
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing-paths.ts b/src/app/+item-page/edit-item-page/edit-item-page.routing-paths.ts
new file mode 100644
index 00000000000..ce76a614dde
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/edit-item-page.routing-paths.ts
@@ -0,0 +1,7 @@
+export const ITEM_EDIT_WITHDRAW_PATH = 'withdraw';
+export const ITEM_EDIT_REINSTATE_PATH = 'reinstate';
+export const ITEM_EDIT_PRIVATE_PATH = 'private';
+export const ITEM_EDIT_PUBLIC_PATH = 'public';
+export const ITEM_EDIT_DELETE_PATH = 'delete';
+export const ITEM_EDIT_MOVE_PATH = 'move';
+export const ITEM_EDIT_AUTHORIZATIONS_PATH = 'authorizations';
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
index e4b1b06730f..3acbd77c40c 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -14,13 +14,23 @@ import { ItemMoveComponent } from './item-move/item-move.component';
 import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
-
-export const ITEM_EDIT_WITHDRAW_PATH = 'withdraw';
-export const ITEM_EDIT_REINSTATE_PATH = 'reinstate';
-export const ITEM_EDIT_PRIVATE_PATH = 'private';
-export const ITEM_EDIT_PUBLIC_PATH = 'public';
-export const ITEM_EDIT_DELETE_PATH = 'delete';
-export const ITEM_EDIT_MOVE_PATH = 'move';
+import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
+import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
+import {
+  ITEM_EDIT_AUTHORIZATIONS_PATH,
+  ITEM_EDIT_MOVE_PATH,
+  ITEM_EDIT_DELETE_PATH,
+  ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_REINSTATE_PATH,
+  ITEM_EDIT_WITHDRAW_PATH
+} from './edit-item-page.routing-paths';
+import { ItemPageReinstateGuard } from './item-page-reinstate.guard';
+import { ItemPageWithdrawGuard } from './item-page-withdraw.guard';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
@@ -90,10 +100,12 @@ export const ITEM_EDIT_MOVE_PATH = 'move';
           {
             path: ITEM_EDIT_WITHDRAW_PATH,
             component: ItemWithdrawComponent,
+            canActivate: [ItemPageWithdrawGuard]
           },
           {
             path: ITEM_EDIT_REINSTATE_PATH,
             component: ItemReinstateComponent,
+            canActivate: [ItemPageReinstateGuard]
           },
           {
             path: ITEM_EDIT_PRIVATE_PATH,
@@ -111,12 +123,45 @@ export const ITEM_EDIT_MOVE_PATH = 'move';
             path: ITEM_EDIT_MOVE_PATH,
             component: ItemMoveComponent,
             data: { title: 'item.edit.move.title' },
+          },
+          {
+            path: ITEM_EDIT_AUTHORIZATIONS_PATH,
+            children: [
+              {
+                path: 'create',
+                resolve: {
+                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                },
+                component: ResourcePolicyCreateComponent,
+                data: { title: 'resource-policies.create.page.title' }
+              },
+              {
+                path: 'edit',
+                resolve: {
+                  resourcePolicy: ResourcePolicyResolver
+                },
+                component: ResourcePolicyEditComponent,
+                data: { title: 'resource-policies.edit.page.title' }
+              },
+              {
+                path: '',
+                component: ItemAuthorizationsComponent,
+                data: { title: 'item.edit.authorizations.title' }
+              }
+            ]
           }
         ]
       }
     ])
   ],
-  providers: []
+  providers: [
+    I18nBreadcrumbResolver,
+    I18nBreadcrumbsService,
+    ResourcePolicyResolver,
+    ResourcePolicyTargetResolver,
+    ItemPageReinstateGuard,
+    ItemPageWithdrawGuard
+  ]
 })
 export class EditItemPageRoutingModule {
 
diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.html
new file mode 100644
index 00000000000..71aa7b44dee
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.html
@@ -0,0 +1,13 @@
+<div class="container">
+  <ds-alert [type]="'alert-info'" [content]="'item.edit.authorizations.heading'"></ds-alert>
+  <ds-resource-policies [resourceType]="'item'" [resourceUUID]="(getItemUUID() | async)"></ds-resource-policies>
+  <ng-container *ngFor="let bundle of (getItemBundles() | async); trackById">
+    <ds-resource-policies [resourceType]="'bundle'"
+                          [resourceUUID]="bundle.id"></ds-resource-policies>
+    <ng-container *ngFor="let bitstream of (bundleBitstreamsMap.get(bundle.id) | async)?.page; trackById">
+      <ds-resource-policies [resourceType]="'bitstream'"
+                            [resourceUUID]="bitstream.id"></ds-resource-policies>
+    </ng-container>
+  </ng-container>
+</div>
+
diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
new file mode 100644
index 00000000000..915d4e17e53
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
@@ -0,0 +1,180 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { ItemAuthorizationsComponent } from './item-authorizations.component';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+
+describe('ItemAuthorizationsComponent test suite', () => {
+  let comp: ItemAuthorizationsComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<ItemAuthorizationsComponent>;
+  let de;
+
+  const linkService: any = getMockLinkService();
+
+  const bitstream1 = Object.assign(new Bitstream(), {
+    id: 'bitstream1',
+    uuid: 'bitstream1'
+  });
+  const bitstream2 = Object.assign(new Bitstream(), {
+    id: 'bitstream2',
+    uuid: 'bitstream2'
+  });
+  const bitstream3 = Object.assign(new Bitstream(), {
+    id: 'bitstream3',
+    uuid: 'bitstream3'
+  });
+  const bitstream4 = Object.assign(new Bitstream(), {
+    id: 'bitstream4',
+    uuid: 'bitstream4'
+  });
+  const bundle1 = Object.assign(new Bundle(), {
+    id: 'bundle1',
+    uuid: 'bundle1',
+    _links: {
+      self: { href: 'bundle1-selflink' }
+    },
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+  });
+  const bundle2 = Object.assign(new Bundle(), {
+    id: 'bundle2',
+    uuid: 'bundle2',
+    _links: {
+      self: { href: 'bundle2-selflink' }
+    },
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4]))
+  });
+  const bundles = [bundle1, bundle2];
+  const bitstreamList1: PaginatedList<Bitstream> = buildPaginatedList(new PageInfo(), [bitstream1, bitstream2]);
+  const bitstreamList2: PaginatedList<Bitstream> = buildPaginatedList(new PageInfo(), [bitstream3, bitstream4]);
+
+  const item = Object.assign(new Item(), {
+    uuid: 'item',
+    id: 'item',
+    _links: {
+      self: { href: 'item-selflink' }
+    },
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2]))
+  });
+
+  const routeStub = {
+    data: observableOf({
+      dso: createSuccessfulRemoteDataObject(item)
+    })
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        NoopAnimationsModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        ItemAuthorizationsComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: LinkService, useValue: linkService },
+        { provide: ActivatedRoute, useValue: routeStub },
+        ItemAuthorizationsComponent
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-item-authorizations></ds-item-authorizations>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create ItemAuthorizationsComponent', inject([ItemAuthorizationsComponent], (app: ItemAuthorizationsComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ItemAuthorizationsComponent);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+      linkService.resolveLink.and.callFake((object, link) => object);
+      fixture.detectChanges();
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should init bundles and bitstreams map  properly', () => {
+      expect(compAsAny.subs.length).toBe(2);
+      expect(compAsAny.bundles$.value).toEqual(bundles);
+      expect(compAsAny.bundleBitstreamsMap.has('bundle1')).toBeTruthy();
+      expect(compAsAny.bundleBitstreamsMap.has('bundle2')).toBeTruthy();
+      let bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle1');
+      expect(bitstreamList).toBeObservable(cold('(a|)', {
+        a: bitstreamList1
+      }));
+
+      bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle2');
+      expect(bitstreamList).toBeObservable(cold('(a|)', {
+        a: bitstreamList2
+      }));
+    });
+
+    it('should get the item UUID', () => {
+
+      expect(comp.getItemUUID()).toBeObservable(cold('(a|)', {
+        a: item.id
+      }));
+
+    });
+
+    it('should get the item\'s bundle', () => {
+
+      expect(comp.getItemBundles()).toBeObservable(cold('a', {
+        a: bundles
+      }));
+
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
new file mode 100644
index 00000000000..c5d5817c330
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -0,0 +1,155 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
+import { catchError, filter, first, flatMap, map, take } from 'rxjs/operators';
+
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataWithNotEmptyPayload
+} from '../../../core/shared/operators';
+import { Item } from '../../../core/shared/item.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { FindListOptions } from '../../../core/data/request.models';
+
+/**
+ * Interface for a bundle's bitstream map entry
+ */
+interface BundleBitstreamsMapEntry {
+  id: string;
+  bitstreams: Observable<PaginatedList<Bitstream>>
+}
+
+@Component({
+  selector: 'ds-item-authorizations',
+  templateUrl: './item-authorizations.component.html'
+})
+/**
+ * Component that handles the item Authorizations
+ */
+export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
+
+  /**
+   * A map that contains all bitstream of the item's bundles
+   * @type {Observable<Map<string, Observable<PaginatedList<Bitstream>>>>}
+   */
+  public bundleBitstreamsMap: Map<string, Observable<PaginatedList<Bitstream>>> = new Map<string, Observable<PaginatedList<Bitstream>>>();
+
+  /**
+   * The list of bundle for the item
+   * @type {Observable<PaginatedList<Bundle>>}
+   */
+  private bundles$: BehaviorSubject<Bundle[]> = new BehaviorSubject<Bundle[]>([]);
+
+  /**
+   * The target editing item
+   * @type {Observable<Item>}
+   */
+  private item$: Observable<Item>;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {LinkService} linkService
+   * @param {ActivatedRoute} route
+   */
+  constructor(
+    private linkService: LinkService,
+    private route: ActivatedRoute
+  ) {
+  }
+
+  /**
+   * Initialize the component, setting up the bundle and bitstream within the item
+   */
+  ngOnInit(): void {
+    this.item$ = this.route.data.pipe(
+      map((data) => data.dso),
+      getFirstSucceededRemoteDataWithNotEmptyPayload(),
+      map((item: Item) => this.linkService.resolveLink(
+        item,
+        followLink('bundles', new FindListOptions(), true, followLink('bitstreams'))
+      ))
+    ) as Observable<Item>;
+
+    const bundles$: Observable<PaginatedList<Bundle>> = this.item$.pipe(
+      filter((item: Item) => isNotEmpty(item.bundles)),
+      flatMap((item: Item) => item.bundles),
+      getFirstSucceededRemoteDataWithNotEmptyPayload(),
+      catchError((error) => {
+        console.error(error);
+        return observableOf(buildPaginatedList(null, []))
+      })
+    );
+
+    this.subs.push(
+      bundles$.pipe(
+        take(1),
+        map((list: PaginatedList<Bundle>) => list.page)
+      ).subscribe((bundles: Bundle[]) => {
+        this.bundles$.next(bundles);
+      }),
+      bundles$.pipe(
+        take(1),
+        flatMap((list: PaginatedList<Bundle>) => list.page),
+        map((bundle: Bundle) => ({ id: bundle.id, bitstreams: this.getBundleBitstreams(bundle) }))
+      ).subscribe((entry: BundleBitstreamsMapEntry) => {
+        this.bundleBitstreamsMap.set(entry.id, entry.bitstreams)
+      })
+    )
+  }
+
+  /**
+   * Return the item's UUID
+   */
+  getItemUUID(): Observable<string> {
+    return this.item$.pipe(
+      map((item: Item) => item.id),
+      first((UUID: string) => isNotEmpty(UUID))
+    )
+  }
+
+  /**
+   * Return all item's bundles
+   *
+   * @return an observable that emits all item's bundles
+   */
+  getItemBundles(): Observable<Bundle[]> {
+    return this.bundles$.asObservable();
+  }
+
+  /**
+   * Return all bundle's bitstreams
+   *
+   * @return an observable that emits all item's bundles
+   */
+  private getBundleBitstreams(bundle: Bundle): Observable<PaginatedList<Bitstream>> {
+    return bundle.bitstreams.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      catchError((error) => {
+        console.error(error);
+        return observableOf(buildPaginatedList(null, []))
+      })
+    )
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe())
+  }
+}
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index dc017a9f92e..82ca1f58d9d 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -36,7 +36,8 @@
     <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles"
                                    [bundle]="bundle"
                                    [item]="item"
-                                   [columnSizes]="columnSizes">
+                                   [columnSizes]="columnSizes"
+                                   (dropObject)="dropBitstream(bundle, $event)">
     </ds-item-edit-bitstream-bundle>
   </div>
   <div *ngIf="bundles?.length === 0"
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index cc1ec39badf..1a8aafd6667 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -1,8 +1,5 @@
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { of as observableOf } from 'rxjs/internal/observable/of';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { Item } from '../../../core/shared/item.model';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ItemBitstreamsComponent } from './item-bitstreams.component';
@@ -13,7 +10,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
 import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
+import {
+  INotification,
+  Notification
+} from '../../../shared/notifications/models/notification.model';
 import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
@@ -26,6 +26,11 @@ import { RestResponse } from '../../../core/cache/response.models';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -55,7 +60,7 @@ const bundle = Object.assign(new Bundle(), {
   _links: {
     self: { href: 'bundle1-selflink' }
   },
-  bitstreams: createMockRDPaginatedObs([bitstream1, bitstream2])
+  bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
 });
 const moveOperations = [
   {
@@ -114,7 +119,7 @@ describe('ItemBitstreamsComponent', () => {
       }
     );
     bitstreamService = jasmine.createSpyObj('bitstreamService', {
-      deleteAndReturnResponse: jasmine.createSpy('deleteAndReturnResponse')
+      delete: jasmine.createSpy('delete')
     });
     objectCache = jasmine.createSpyObj('objectCache', {
       remove: jasmine.createSpy('remove')
@@ -130,18 +135,19 @@ describe('ItemBitstreamsComponent', () => {
       _links: {
         self: { href: 'item-selflink' }
       },
-      bundles: createMockRDPaginatedObs([bundle]),
+      bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle])),
       lastModified: date
     });
     itemService = Object.assign( {
-      getBitstreams: () => createMockRDPaginatedObs([bitstream1, bitstream2]),
-      findById: () => createMockRDObs(item),
-      getBundles: () => createMockRDPaginatedObs([bundle])
+      getBitstreams: () => createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
+      findById: () => createSuccessfulRemoteDataObject$(item),
+      getBundles: () => createSuccessfulRemoteDataObject$(createPaginatedList([bundle]))
     });
     route = Object.assign({
       parent: {
-        data: observableOf({ item: createMockRD(item) })
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
       },
+      data: observableOf({}),
       url: url
     });
     bundleService = jasmine.createSpyObj('bundleService', {
@@ -181,15 +187,41 @@ describe('ItemBitstreamsComponent', () => {
       comp.submit();
     });
 
-    it('should call deleteAndReturnResponse on the bitstreamService for the marked field', () => {
-      expect(bitstreamService.deleteAndReturnResponse).toHaveBeenCalledWith(bitstream2.id);
+    it('should call delete on the bitstreamService for the marked field', () => {
+      expect(bitstreamService.delete).toHaveBeenCalledWith(bitstream2.id);
     });
 
-    it('should not call deleteAndReturnResponse on the bitstreamService for the unmarked field', () => {
-      expect(bitstreamService.deleteAndReturnResponse).not.toHaveBeenCalledWith(bitstream1.id);
+    it('should not call delete on the bitstreamService for the unmarked field', () => {
+      expect(bitstreamService.delete).not.toHaveBeenCalledWith(bitstream1.id);
     });
+  });
+
+  describe('when dropBitstream is called', () => {
+    const event = {
+      fromIndex: 0,
+      toIndex: 50,
+      // tslint:disable-next-line:no-empty
+      finish: () => {}
+    };
+
+    beforeEach(() => {
+      comp.dropBitstream(bundle, event);
+    });
+  });
 
-    it('should send out a patch for the move operations', () => {
+  describe('when dropBitstream is called', () => {
+    beforeEach((done) => {
+      comp.dropBitstream(bundle, {
+        fromIndex: 0,
+        toIndex: 50,
+        // tslint:disable-next-line:no-empty
+        finish: () => {
+          done();
+        }
+      })
+    });
+
+    it('should send out a patch for the move operation', () => {
       expect(bundleService.patch).toHaveBeenCalled();
     });
   });
@@ -208,15 +240,3 @@ describe('ItemBitstreamsComponent', () => {
     });
   });
 });
-
-export function createMockRDPaginatedObs(list: any[]) {
-  return createMockRDObs(new PaginatedList(new PageInfo(), list));
-}
-
-export function createMockRDObs(obj: any) {
-  return observableOf(createMockRD(obj));
-}
-
-export function createMockRD(obj: any) {
-  return new RemoteData(false, false, true, null, obj);
-}
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 009cc978b21..80daf4cf777 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,6 +1,6 @@
-import { ChangeDetectorRef, Component, Inject, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { Observable } from 'rxjs/internal/Observable';
 import { Subscription } from 'rxjs/internal/Subscription';
 import { ItemDataService } from '../../../core/data/item-data.service';
@@ -9,25 +9,24 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
-import { zip as observableZip, combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
-import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { zip as observableZip, of as observableOf } from 'rxjs';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { Item } from '../../../core/shared/item.model';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
-import { Operation } from 'fast-json-patch';
-import { MoveOperation } from 'fast-json-patch/lib/core';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
 import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { Operation } from 'fast-json-patch';
 
 @Component({
   selector: 'ds-item-bitstreams',
@@ -90,7 +89,8 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public objectCache: ObjectCacheService,
     public requestService: RequestService,
     public cdRef: ChangeDetectorRef,
-    public bundleService: BundleDataService
+    public bundleService: BundleDataService,
+    public zone: NgZone
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
@@ -108,7 +108,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   postItemInit(): void {
     this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: this.bundlesOptions})).pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       map((bundlePage: PaginatedList<Bundle>) => bundlePage.page)
     );
@@ -126,10 +126,10 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * Also re-initialize the original fields and updates
    */
   initializeItemUpdate(): void {
-    this.itemUpdateSubscription = this.requestService.hasByHrefObservable(this.item.self).pipe(
+    this.itemUpdateSubscription = this.requestService.hasByHref$(this.item.self).pipe(
       filter((exists: boolean) => !exists),
       switchMap(() => this.itemService.findById(this.item.uuid)),
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
     ).subscribe((itemRD: RemoteData<Item>) => {
       if (hasValue(itemRD)) {
         this.item = itemRD.payload;
@@ -143,7 +143,6 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
 
   /**
    * Submit the current changes
-   * Bitstreams that were dragged around send out a patch request with move operations to the rest API
    * Bitstreams marked as deleted send out a delete request to the rest API
    * Display notifications and reset the current item/updates
    */
@@ -151,32 +150,6 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     this.submitting = true;
     const bundlesOnce$ = this.bundles$.pipe(take(1));
 
-    // Fetch all move operations for each bundle
-    const moveOperations$ = bundlesOnce$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) =>
-        this.objectUpdatesService.getMoveOperations(bundle.self).pipe(
-          take(1),
-          map((operations: MoveOperation[]) => [...operations.map((operation: MoveOperation) => Object.assign(operation, {
-            from: `/_links/bitstreams${operation.from}/href`,
-            path: `/_links/bitstreams${operation.path}/href`
-          }))])
-        )
-      )))
-    );
-
-    // Send out an immediate patch request for each bundle
-    const patchResponses$ = observableCombineLatest(bundlesOnce$, moveOperations$).pipe(
-      switchMap(([bundles, moveOperationList]: [Bundle[], Operation[][]]) =>
-        observableZip(...bundles.map((bundle: Bundle, index: number) => {
-          if (isNotEmpty(moveOperationList[index])) {
-            return this.bundleService.patch(bundle, moveOperationList[index]);
-          } else {
-            return observableOf(undefined);
-          }
-        }))
-      )
-    );
-
     // Fetch all removed bitstreams from the object update service
     const removedBitstreams$ = bundlesOnce$.pipe(
       switchMap((bundles: Bundle[]) => observableZip(
@@ -193,7 +166,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
       take(1),
       switchMap((removedBistreams: Bitstream[]) => {
         if (isNotEmpty(removedBistreams)) {
-          return observableZip(...removedBistreams.map((bitstream: Bitstream) => this.bitstreamService.deleteAndReturnResponse(bitstream.id)));
+          return observableZip(...removedBistreams.map((bitstream: Bitstream) => this.bitstreamService.delete(bitstream.id)));
         } else {
           return observableOf(undefined);
         }
@@ -201,19 +174,42 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     );
 
     // Perform the setup actions from above in order and display notifications
-    patchResponses$.pipe(
-      switchMap((responses: RestResponse[]) => {
-        this.displayNotifications('item.edit.bitstreams.notifications.move', responses);
-        return removedResponses$
-      }),
-      take(1)
-    ).subscribe((responses: RestResponse[]) => {
+    removedResponses$.pipe(take(1)).subscribe((responses: Array<RemoteData<NoContent>>) => {
       this.displayNotifications('item.edit.bitstreams.notifications.remove', responses);
       this.reset();
       this.submitting = false;
     });
   }
 
+  /**
+   * A bitstream was dropped in a new location. Send out a Move Patch request to the REST API, display notifications,
+   * refresh the bundle's cache (so the lists can properly reload) and call the event's callback function (which will
+   * navigate the user to the correct page)
+   * @param bundle  The bundle to send patch requests to
+   * @param event   The event containing the index the bitstream came from and was dropped to
+   */
+  dropBitstream(bundle: Bundle, event: any) {
+    this.zone.runOutsideAngular(() => {
+      if (hasValue(event) && hasValue(event.fromIndex) && hasValue(event.toIndex) && hasValue(event.finish)) {
+        const moveOperation = {
+          op: 'move',
+          from: `/_links/bitstreams/${event.fromIndex}/href`,
+          path: `/_links/bitstreams/${event.toIndex}/href`
+        } as Operation;
+        this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
+          this.zone.run(() => {
+            this.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
+            // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
+            this.requestService.removeByHrefSubstring(bundle.self).pipe(
+              filter((isCached) => isCached),
+              take(1)
+            ).subscribe(() => event.finish());
+          });
+        });
+      }
+    });
+  }
+
   /**
    * Display notifications
    * - Error notification for each failed response with their message
@@ -221,12 +217,12 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * @param key       The i18n key for the notification messages
    * @param responses The returned responses to display notifications for
    */
-  displayNotifications(key: string, responses: RestResponse[]) {
+  displayNotifications(key: string, responses: Array<RemoteData<any>>) {
     if (isNotEmpty(responses)) {
-      const failedResponses = responses.filter((response: RestResponse) => hasValue(response) && !response.isSuccessful);
-      const successfulResponses = responses.filter((response: RestResponse) => hasValue(response) && response.isSuccessful);
+      const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
+      const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
 
-      failedResponses.forEach((response: ErrorResponse) => {
+      failedResponses.forEach((response: RemoteData<Bundle>) => {
         this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), response.errorMessage);
       });
       if (successfulResponses.length > 0) {
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 58273bb9318..c28ef9b5257 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -17,5 +17,5 @@
       </div>
     </div>
   </div>
-  <ds-paginated-drag-and-drop-bitstream-list [bundle]="bundle" [columnSizes]="columnSizes"></ds-paginated-drag-and-drop-bitstream-list>
+  <ds-paginated-drag-and-drop-bitstream-list [bundle]="bundle" [columnSizes]="columnSizes" (dropObject)="dropObject.emit($event)"></ds-paginated-drag-and-drop-bitstream-list>
 </ng-template>
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 115e3262417..72e2055bf72 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewContainerRef } from '@angular/core';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
@@ -36,6 +36,13 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   @Input() columnSizes: ResponsiveTableSizes;
 
+  /**
+   * Send an event when the user drops an object on the pagination
+   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
+   * not just within a single page)
+   */
+  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
+
   /**
    * The bootstrap sizes used for the Bundle Name column
    * This column stretches over the first 3 columns and thus is a combination of their sizes processed in ngOnInit
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
index 25941f472e5..9197b89796d 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
@@ -7,24 +7,29 @@
                [collectionSize]="(objectsRD$ | async)?.payload?.totalElements"
                [disableRouteParameterUpdate]="true"
                (pageChange)="switchPage($event)">
-  <div [id]="bundle.id" class="bundle-bitstreams-list"
-       [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
-       *ngVar="((updates$ | async) | dsObjectValues) as updateValues" cdkDropList (cdkDropListDropped)="drop($event)">
-    <div class="row bitstream-row" *ngFor="let updateValue of updateValues" cdkDrag
-         [id]="updateValue.field.uuid"
-         [ngClass]="{
-                  'table-warning': updateValue.changeType === 0,
-                  'table-danger': updateValue.changeType === 2,
-                  'table-success': updateValue.changeType === 1,
-                  'bg-white': updateValue.changeType === undefined
+  <ng-container *ngIf="!(loading$ | async)">
+    <div [id]="bundle.id" class="bundle-bitstreams-list"
+         [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
+         *ngVar="(updates$ | async) as updates" cdkDropList (cdkDropListDropped)="drop($event)">
+      <ng-container *ngIf="updates">
+        <div class="row bitstream-row" *ngFor="let uuid of customOrder" cdkDrag
+             [id]="uuid"
+             [ngClass]="{
+                  'table-warning': updates[uuid].changeType === 0,
+                  'table-danger': updates[uuid].changeType === 2,
+                  'table-success': updates[uuid].changeType === 1,
+                  'bg-white': updates[uuid].changeType === undefined
                 }">
-      <ds-item-edit-bitstream [fieldUpdate]="updateValue"
-                              [bundleUrl]="bundle.self"
-                              [columnSizes]="columnSizes">
-        <div class="d-flex align-items-center" slot="drag-handle" cdkDragHandle>
-          <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
+          <ds-item-edit-bitstream [fieldUpdate]="updates[uuid]"
+                                  [bundleUrl]="bundle.self"
+                                  [columnSizes]="columnSizes">
+            <div class="d-flex align-items-center" slot="drag-handle" cdkDragHandle>
+              <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
+            </div>
+          </ds-item-edit-bitstream>
         </div>
-      </ds-item-edit-bitstream>
+      </ng-container>
     </div>
-  </div>
+  </ng-container>
+  <ds-loading *ngIf="(loading$ | async)" [message]="'loading.bitstreams' | translate"></ds-loading>
 </ds-pagination>
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
index 03d1d00520d..28ef32610e9 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
@@ -7,7 +7,6 @@ import { VarDirective } from '../../../../../shared/utils/var.directive';
 import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
 import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
 import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { createMockRDObs } from '../../item-bitstreams.component.spec';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
 import { of as observableOf } from 'rxjs/internal/observable/of';
@@ -16,12 +15,15 @@ import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-siz
 import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../../../shared/testing/utils.test';
+import { RequestService } from '../../../../../core/data/request.service';
 
 describe('PaginatedDragAndDropBitstreamListComponent', () => {
   let comp: PaginatedDragAndDropBitstreamListComponent;
   let fixture: ComponentFixture<PaginatedDragAndDropBitstreamListComponent>;
   let objectUpdatesService: ObjectUpdatesService;
   let bundleService: BundleDataService;
+  let objectValuesPipe: ObjectValuesPipe;
+  let requestService: RequestService;
 
   const columnSizes = new ResponsiveTableSizes([
     new ResponsiveColumnSizes(2, 2, 3, 4, 4),
@@ -46,7 +48,7 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
     name: 'Fake Bitstream 1',
     bundleName: 'ORIGINAL',
     description: 'Description',
-    format: createMockRDObs(format)
+    format: createSuccessfulRemoteDataObject$(format)
   });
   const fieldUpdate1 = {
     field: bitstream1,
@@ -57,7 +59,7 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
     name: 'Fake Bitstream 2',
     bundleName: 'ORIGINAL',
     description: 'Description',
-    format: createMockRDObs(format)
+    format: createSuccessfulRemoteDataObject$(format)
   });
   const fieldUpdate2 = {
     field: bitstream2,
@@ -97,15 +99,24 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
     );
 
     bundleService = jasmine.createSpyObj('bundleService', {
-      getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+      getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
+      getBitstreamsEndpoint: observableOf('')
+    });
+
+    objectValuesPipe = new ObjectValuesPipe();
+
+    requestService = jasmine.createSpyObj('requestService', {
+      hasByHref$: observableOf(true)
     });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [PaginatedDragAndDropBitstreamListComponent, VarDirective, ObjectValuesPipe],
+      declarations: [PaginatedDragAndDropBitstreamListComponent, VarDirective],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: BundleDataService, useValue: bundleService }
+        { provide: BundleDataService, useValue: bundleService },
+        { provide: ObjectValuesPipe, useValue: objectValuesPipe },
+        { provide: RequestService, useValue: requestService }
       ], schemas: [
         NO_ERRORS_SCHEMA
       ]
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
index 5548da40295..bb77bfc0c41 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
@@ -8,6 +8,8 @@ import { switchMap } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../../../../../shared/search/paginated-search-options.model';
 import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
+import { RequestService } from '../../../../../core/data/request.service';
 
 @Component({
   selector: 'ds-paginated-drag-and-drop-bitstream-list',
@@ -33,8 +35,10 @@ export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginate
 
   constructor(protected objectUpdatesService: ObjectUpdatesService,
               protected elRef: ElementRef,
-              protected bundleService: BundleDataService) {
-    super(objectUpdatesService, elRef);
+              protected objectValuesPipe: ObjectValuesPipe,
+              protected bundleService: BundleDataService,
+              protected requestService: RequestService) {
+    super(objectUpdatesService, elRef, objectValuesPipe);
   }
 
   ngOnInit() {
@@ -46,11 +50,17 @@ export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginate
    */
   initializeObjectsRD(): void {
     this.objectsRD$ = this.currentPage$.pipe(
-      switchMap((page: number) => this.bundleService.getBitstreams(
-        this.bundle.id,
-        new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })}),
-        followLink('format')
-      ))
+      switchMap((page: number) => {
+        const paginatedOptions = new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })});
+        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
+          switchMap((href) => this.requestService.hasByHref$(href)),
+          switchMap(() => this.bundleService.getBitstreams(
+            this.bundle.id,
+            paginatedOptions,
+            followLink('format')
+          ))
+        );
+      })
     );
   }
 
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
index 30b5e0d3764..e6da42931ac 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
@@ -6,10 +6,10 @@ import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../../shared/utils/var.directive';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { createMockRDObs } from '../item-bitstreams.component.spec';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 let comp: ItemEditBitstreamComponent;
 let fixture: ComponentFixture<ItemEditBitstreamComponent>;
@@ -29,7 +29,7 @@ const bitstream = Object.assign(new Bitstream(), {
   name: 'Fake Bitstream',
   bundleName: 'ORIGINAL',
   description: 'Description',
-  format: createMockRDObs(format)
+  format: createSuccessfulRemoteDataObject$(format)
 });
 const fieldUpdate = {
   field: bitstream,
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
index 5a02b9cac45..5f977665579 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
@@ -6,7 +6,7 @@ import { ObjectUpdatesService } from '../../../../core/data/object-updates/objec
 import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
 import { Observable } from 'rxjs/internal/Observable';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../../core/shared/operators';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
@@ -74,7 +74,7 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
     this.bitstream = cloneDeep(this.fieldUpdate.field) as Bitstream;
     this.bitstreamName = this.dsoNameService.getName(this.bitstream);
     this.format$ = this.bitstream.format.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload()
     );
   }
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
index 15b860a7820..6ee630572a9 100644
--- a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
@@ -12,11 +12,9 @@ import { SortDirection, SortOptions } from '../../../core/cache/models/sort-opti
 import { RestResponse } from '../../../core/cache/response.models';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { PaginatedList } from '../../../core/data/paginated-list';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { ErrorComponent } from '../../../shared/error/error.component';
@@ -38,6 +36,12 @@ import { SearchServiceStub } from '../../../shared/testing/search-service.stub';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { ItemCollectionMapperComponent } from './item-collection-mapper.component';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 describe('ItemCollectionMapperComponent', () => {
   let comp: ItemCollectionMapperComponent;
@@ -55,7 +59,7 @@ describe('ItemCollectionMapperComponent', () => {
     id: '932c7d50-d85a-44cb-b9dc-b427b12877bd',
     name: 'test-item'
   });
-  const mockItemRD: RemoteData<Item> = new RemoteData<Item>(false, false, true, null, mockItem);
+  const mockItemRD: RemoteData<Item> = createSuccessfulRemoteDataObject(mockItem);
   const mockSearchOptions = of(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
@@ -74,10 +78,10 @@ describe('ItemCollectionMapperComponent', () => {
   const searchConfigServiceStub = {
     paginatedSearchOptions: mockSearchOptions
   };
-  const mockCollectionsRD = new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []));
+  const mockCollectionsRD = createSuccessfulRemoteDataObject(createPaginatedList([]));
   const itemDataServiceStub = {
-    mapToCollection: () => of(new RestResponse(true, 200, 'OK')),
-    removeMappingFromCollection: () => of(new RestResponse(true, 200, 'OK')),
+    mapToCollection: () => createSuccessfulRemoteDataObject$({}),
+    removeMappingFromCollection: () => createSuccessfulRemoteDataObject$({}),
     getMappedCollections: () => of(mockCollectionsRD),
     /* tslint:disable:no-empty */
     clearMappedCollectionsRequests: () => {}
@@ -89,7 +93,7 @@ describe('ItemCollectionMapperComponent', () => {
     clearDiscoveryRequests: () => {}
     /* tslint:enable:no-empty */
   });
-  const activatedRouteStub = new ActivatedRouteStub({}, { item: mockItemRD });
+  const activatedRouteStub = new ActivatedRouteStub({}, { dso: mockItemRD });
   const translateServiceStub = {
     get: () => of('test-message of item ' + mockItem.name),
     onLangChange: new EventEmitter(),
@@ -143,7 +147,7 @@ describe('ItemCollectionMapperComponent', () => {
     });
 
     it('should display an error message if at least one mapping was unsuccessful', () => {
-      spyOn(itemDataService, 'mapToCollection').and.returnValue(of(new RestResponse(false, 404, 'Not Found')));
+      spyOn(itemDataService, 'mapToCollection').and.returnValue(createFailedRemoteDataObject$('Not Found', 404));
       comp.mapCollections(ids);
       expect(notificationsService.success).not.toHaveBeenCalled();
       expect(notificationsService.error).toHaveBeenCalled();
@@ -160,7 +164,7 @@ describe('ItemCollectionMapperComponent', () => {
     });
 
     it('should display an error message if the removal of at least one mapping was unsuccessful', () => {
-      spyOn(itemDataService, 'removeMappingFromCollection').and.returnValue(of(new RestResponse(false, 404, 'Not Found')));
+      spyOn(itemDataService, 'removeMappingFromCollection').and.returnValue(createFailedRemoteDataObject$('Not Found', 404));
       comp.removeMappings(ids);
       expect(notificationsService.success).not.toHaveBeenCalled();
       expect(notificationsService.error).toHaveBeenCalled();
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index 8477ae5c216..03328f18c2f 100644
--- a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -4,13 +4,13 @@ import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
-  getSucceededRemoteData,
+  getFirstSucceededRemoteData,
   toDSpaceObjectListRD
 } from '../../../core/shared/operators';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -20,11 +20,11 @@ import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { isNotEmpty } from '../../../shared/empty.util';
-import { RestResponse } from '../../../core/cache/response.models';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-item-collection-mapper',
@@ -92,7 +92,7 @@ export class ItemCollectionMapperComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.data.pipe(map((data) => data.item)).pipe(getSucceededRemoteData()) as Observable<RemoteData<Item>>;
+    this.itemRD$ = this.route.data.pipe(map((data) => data.dso)).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Item>>;
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.loadCollectionLists();
   }
@@ -125,7 +125,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       switchMap(([itemCollectionsRD, owningCollectionRD, searchOptions]) => {
         return this.searchService.search(Object.assign(new PaginatedSearchOptions(searchOptions), {
           query: this.buildQuery([...itemCollectionsRD.payload.page, owningCollectionRD.payload], searchOptions.query),
-          dsoType: DSpaceObjectType.COLLECTION
+          dsoTypes: [DSpaceObjectType.COLLECTION]
         }), 10000).pipe(
           toDSpaceObjectListRD(),
           startWith(undefined)
@@ -141,13 +141,13 @@ export class ItemCollectionMapperComponent implements OnInit {
   mapCollections(ids: string[]) {
     const itemIdAndExcludingIds$ = observableCombineLatest(
       this.itemRD$.pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         take(1),
         map((rd: RemoteData<Item>) => rd.payload),
         map((item: Item) => item.id)
       ),
       this.itemCollectionsRD$.pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         take(1),
         map((rd: RemoteData<PaginatedList<Collection>>) => rd.payload.page),
         map((collections: Collection[]) => collections.map((collection: Collection) => collection.id))
@@ -168,7 +168,7 @@ export class ItemCollectionMapperComponent implements OnInit {
    */
   removeMappings(ids: string[]) {
     const responses$ = this.itemRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((itemRD: RemoteData<Item>) => itemRD.payload.id),
       switchMap((itemId: string) => observableCombineLatest(ids.map((id: string) => this.itemDataService.removeMappingFromCollection(itemId, id))))
     );
@@ -191,10 +191,10 @@ export class ItemCollectionMapperComponent implements OnInit {
    * @param {Observable<RestResponse[]>} responses$   The responses after adding/removing a mapping
    * @param {string} messagePrefix                    The prefix to build the notification messages with
    */
-  private showNotifications(responses$: Observable<RestResponse[]>, messagePrefix: string) {
-    responses$.subscribe((responses: RestResponse[]) => {
-      const successful = responses.filter((response: RestResponse) => response.isSuccessful);
-      const unsuccessful = responses.filter((response: RestResponse) => !response.isSuccessful);
+  private showNotifications(responses$: Observable<Array<RemoteData<NoContent>>>, messagePrefix: string) {
+    responses$.subscribe((responses: Array<RemoteData<NoContent>>) => {
+      const successful = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+      const unsuccessful = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
       if (successful.length > 0) {
         const successMessages = observableCombineLatest(
           this.translateService.get(`${messagePrefix}.success.head`),
@@ -280,7 +280,7 @@ export class ItemCollectionMapperComponent implements OnInit {
    */
   onCancel() {
     this.itemRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       take(1)
     ).subscribe((item: Item) => {
diff --git a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
index 7233dbeaa18..53ae74a96c3 100644
--- a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
@@ -16,16 +16,17 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemDeleteComponent } from './item-delete.component';
-import { getItemEditPath } from '../../item-page-routing.module';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { getItemEditRoute } from '../../item-page-routing-paths';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 let comp: ItemDeleteComponent;
 let fixture: ComponentFixture<ItemDeleteComponent>;
@@ -78,52 +79,16 @@ describe('ItemDeleteComponent', () => {
       Object.assign(new Relationship(), {
         id: '1',
         uuid: 'relationship-1',
-        relationshipType: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          type1
-        )),
-        leftItem:  observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          mockItem,
-        )),
-        rightItem:  observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          Object.assign(new Item(), {})
-        )),
+        relationshipType: createSuccessfulRemoteDataObject$(type1),
+        leftItem:  createSuccessfulRemoteDataObject$(mockItem),
+        rightItem:  createSuccessfulRemoteDataObject$(new Item()),
       }),
       Object.assign(new Relationship(), {
         id: '2',
         uuid: 'relationship-2',
-        relationshipType: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          type2
-        )),
-        leftItem:  observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          mockItem,
-        )),
-        rightItem:  observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          Object.assign(new Item(), {})
-        )),
+        relationshipType: createSuccessfulRemoteDataObject$(type2),
+        leftItem:  createSuccessfulRemoteDataObject$(mockItem),
+        rightItem:  createSuccessfulRemoteDataObject$(new Item()),
       }),
     ];
 
@@ -133,12 +98,12 @@ describe('ItemDeleteComponent', () => {
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      delete: observableOf(true)
+      delete: createSuccessfulRemoteDataObject$({})
     });
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject(mockItem)
+        dso: createSuccessfulRemoteDataObject(mockItem)
       })
     };
 
@@ -149,20 +114,8 @@ describe('ItemDeleteComponent', () => {
 
     entityTypeService = jasmine.createSpyObj('entityTypeService',
       {
-        getEntityTypeByLabel: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          itemType,
-        )),
-        getEntityTypeRelationships: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          new PaginatedList(new PageInfo(), types),
-        )),
+        getEntityTypeByLabel: createSuccessfulRemoteDataObject$(itemType),
+        getEntityTypeRelationships: createSuccessfulRemoteDataObject$(createPaginatedList(types)),
       }
     );
 
@@ -233,8 +186,7 @@ describe('ItemDeleteComponent', () => {
   describe('notify', () => {
     it('should navigate to the item edit page on failed deletion of the item', () => {
       comp.notify(false);
-      expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditPath('fake-id')]);
+      expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditRoute('fake-id')]);
     });
   });
-})
-;
+});
diff --git a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
index eecbdf8c6fc..ffe71948d5a 100644
--- a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -1,24 +1,37 @@
-import {Component, Input, OnInit} from '@angular/core';
-import {filter, first, map, switchMap, take} from 'rxjs/operators';
-import {AbstractSimpleItemActionComponent} from '../simple-item-action/abstract-simple-item-action.component';
-import {getItemEditPath} from '../../item-page-routing.module';
-import {NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
-import {combineLatest as observableCombineLatest, combineLatest, Observable} from 'rxjs';
-import {RelationshipType} from '../../../core/shared/item-relationships/relationship-type.model';
-import {VirtualMetadata} from '../virtual-metadata/virtual-metadata.component';
-import {Relationship} from '../../../core/shared/item-relationships/relationship.model';
-import {getRemoteDataPayload, getSucceededRemoteData} from '../../../core/shared/operators';
-import {hasValue, isNotEmpty} from '../../../shared/empty.util';
-import {Item} from '../../../core/shared/item.model';
-import {MetadataValue} from '../../../core/shared/metadata.models';
-import {ViewMode} from '../../../core/shared/view-mode.model';
-import {ActivatedRoute, Router} from '@angular/router';
-import {NotificationsService} from '../../../shared/notifications/notifications.service';
-import {ItemDataService} from '../../../core/data/item-data.service';
-import {TranslateService} from '@ngx-translate/core';
-import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service';
-import {RelationshipService} from '../../../core/data/relationship.service';
-import {EntityTypeService} from '../../../core/data/entity-type.service';
+import { Component, Input, OnInit } from '@angular/core';
+import { defaultIfEmpty, filter, map, switchMap, take } from 'rxjs/operators';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  combineLatest as observableCombineLatest,
+  combineLatest,
+  Observable,
+  of as observableOf
+} from 'rxjs';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { VirtualMetadata } from '../virtual-metadata/virtual-metadata.component';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { TranslateService } from '@ngx-translate/core';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RelationshipService } from '../../../core/data/relationship.service';
+import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { getItemEditRoute } from '../../item-page-routing-paths';
+import { RemoteData } from '../../../core/data/remote-data';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 @Component({
   selector: 'ds-item-delete',
@@ -80,6 +93,7 @@ export class ItemDeleteComponent
               protected objectUpdatesService: ObjectUpdatesService,
               protected relationshipService: RelationshipService,
               protected entityTypeService: EntityTypeService,
+              protected linkService: LinkService,
   ) {
     super(
       route,
@@ -98,30 +112,33 @@ export class ItemDeleteComponent
     super.ngOnInit();
     this.url = this.router.url;
 
-    this.types$ = this.entityTypeService.getEntityTypeByLabel(
-      this.item.firstMetadataValue('relationship.type')
-    ).pipe(
-      getSucceededRemoteData(),
-      getRemoteDataPayload(),
-      switchMap((entityType) => this.entityTypeService.getEntityTypeRelationships(entityType.id)),
-      getSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((relationshipTypes) => relationshipTypes.page),
-      switchMap((types) =>
-        combineLatest(types.map((type) => this.getRelationships(type))).pipe(
-          map((relationships) =>
-            types.reduce<RelationshipType[]>((includedTypes, type, index) => {
-              if (!includedTypes.some((includedType) => includedType.id === type.id)
-                && !(relationships[index].length === 0)) {
-                return [...includedTypes, type];
-              } else {
-                return includedTypes;
-              }
-            }, [])
-          ),
-        )
-      ),
-    );
+    const label = this.item.firstMetadataValue('relationship.type');
+    if (label !== undefined) {
+      this.types$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        switchMap((entityType) => this.entityTypeService.getEntityTypeRelationships(entityType.id)),
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        map((relationshipTypes) => relationshipTypes.page),
+        switchMap((types) =>
+          combineLatest(types.map((type) => this.getRelationships(type))).pipe(
+            map((relationships) =>
+              types.reduce<RelationshipType[]>((includedTypes, type, index) => {
+                if (!includedTypes.some((includedType) => includedType.id === type.id)
+                  && !(relationships[index].length === 0)) {
+                  return [...includedTypes, type];
+                } else {
+                  return includedTypes;
+                }
+              }, [])
+            ),
+          )
+        ),
+      );
+    } else {
+      this.types$ = observableOf([]);
+    }
 
     this.types$.pipe(
       take(1),
@@ -187,6 +204,7 @@ export class ItemDeleteComponent
             observableCombineLatest(
               relationships.map((relationship) => this.getRelationshipType(relationship))
             ).pipe(
+              defaultIfEmpty([]),
               map((types) => relationships.filter(
                 (relationship, index) => relationshipType.id === types[index].id
               )),
@@ -205,8 +223,14 @@ export class ItemDeleteComponent
    */
   private getRelationshipType(relationship: Relationship): Observable<RelationshipType> {
 
+    this.linkService.resolveLinks(
+      relationship,
+      followLink('relationshipType'),
+      followLink('leftItem'),
+      followLink('rightItem'),
+    );
     return relationship.relationshipType.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       filter((relationshipType: RelationshipType) => hasValue(relationshipType) && isNotEmpty(relationshipType.uuid))
     );
@@ -224,7 +248,7 @@ export class ItemDeleteComponent
         relationship,
         this.isLeftItem(relationship).pipe(
           switchMap((isLeftItem) => isLeftItem ? relationship.rightItem : relationship.leftItem),
-          getSucceededRemoteData(),
+          getFirstSucceededRemoteData(),
           getRemoteDataPayload(),
         ),
       );
@@ -271,7 +295,7 @@ export class ItemDeleteComponent
   private isLeftItem(relationship: Relationship): Observable<boolean> {
 
     return relationship.leftItem.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       map((leftItem) => leftItem.uuid === this.item.uuid)
@@ -305,6 +329,7 @@ export class ItemDeleteComponent
         combineLatest(
           types.map((type) => this.isSelected(type))
         ).pipe(
+          defaultIfEmpty([]),
           map((selection) => types.filter(
             (type, index) => selection[index]
           )),
@@ -312,9 +337,9 @@ export class ItemDeleteComponent
         )
       ),
     ).subscribe((types) => {
-      this.itemDataService.delete(this.item.id, types).pipe(first()).subscribe(
-        (succeeded: boolean) => {
-          this.notify(succeeded);
+      this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData()).subscribe(
+        (rd: RemoteData<NoContent>) => {
+          this.notify(rd.hasSucceeded);
         }
       );
     });
@@ -330,7 +355,7 @@ export class ItemDeleteComponent
       this.router.navigate(['']);
     } else {
       this.notificationsService.error(this.translateService.get('item.edit.' + this.messageKey + '.error'));
-      this.router.navigate([getItemEditPath(this.item.id)]);
+      this.router.navigate([getItemEditRoute(this.item.id)]);
     }
   }
 }
diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
index e8ffc28920a..cf226f77333 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
@@ -4,19 +4,20 @@
             <span>{{metadata?.key?.split('.').join('.&#8203;')}}</span>
         </div>
         <div *ngIf="(editable | async)" class="field-container">
-            <ds-filter-input-suggestions [suggestions]="(metadataFieldSuggestions | async)"
-                                  [(ngModel)]="metadata.key"
+            <ds-validation-suggestions [suggestions]="(metadataFieldSuggestions | async)"
+                                         [(ngModel)]="metadata.key"
+                                         [url]="this.url"
+                                         [metadata]="this.metadata"
                                   (submitSuggestion)="update(suggestionControl)"
                                   (clickSuggestion)="update(suggestionControl)"
                                   (typeSuggestion)="update(suggestionControl)"
                                   (dsClickOutside)="checkValidity(suggestionControl)"
                                   (findSuggestions)="findMetadataFieldSuggestions($event)"
                                   #suggestionControl="ngModel"
-                                  [dsInListValidator]="metadataFields"
                                   [valid]="(valid | async) !== false"
                                   dsAutoFocus autoFocusSelector=".suggestion_input"
                                   [ngModelOptions]="{standalone: true}"
-            ></ds-filter-input-suggestions>
+            ></ds-validation-suggestions>
         </div>
         <small class="text-danger"
                *ngIf="(valid | async) === false">{{"item.edit.metadata.metadatafield.invalid" | translate}}</small>
@@ -46,12 +47,12 @@
 </td>
 <td class="text-center">
     <div class="btn-group edit-field">
-        <button [disabled]="!(canSetEditable() | async)" *ngIf="!(editable | async)"
+        <button [disabled]="!(canSetEditable() | async)" *ngIf="!(editable | async)"
                 (click)="setEditable(true)" class="btn btn-outline-primary btn-sm"
                 title="{{'item.edit.metadata.edit.buttons.edit' | translate}}">
             <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [disabled]="!(canSetUneditable() | async)" *ngIf="(editable | async)"
+        <button [disabled]="!(canSetUneditable() | async) || (valid | async) === false" *ngIf="(editable | async)"
                 (click)="setEditable(false)" class="btn btn-outline-success btn-sm"
                 title="{{'item.edit.metadata.edit.buttons.unedit' | translate}}">
             <i class="fas fa-check fa-fw"></i>
@@ -67,4 +68,4 @@
             <i class="fas fa-undo-alt fa-fw"></i>
         </button>
     </div>
-</td>
\ No newline at end of file
+</td>
diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
index 19765f0e095..709e451bd3d 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
@@ -1,22 +1,28 @@
 import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+import { MetadataFieldDataService } from '../../../../core/data/metadata-field-data.service';
 import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
 import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
-import { SharedModule } from '../../../../shared/shared.module';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject$
+} from '../../../../shared/remote-data.utils';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import { EditInPlaceFieldComponent } from './edit-in-place-field.component';
+import { MockComponent, MockDirective } from 'ng-mocks';
+import { DebounceDirective } from '../../../../shared/utils/debounce.directive';
+import { ValidationSuggestionsComponent } from '../../../../shared/input-suggestions/validation-suggestions/validation-suggestions.component';
 
 let comp: EditInPlaceFieldComponent;
 let fixture: ComponentFixture<EditInPlaceFieldComponent>;
@@ -25,17 +31,21 @@ let el: HTMLElement;
 let metadataFieldService;
 let objectUpdatesService;
 let paginatedMetadataFields;
-const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' })
+const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' });
+const mdSchemaRD$ = createSuccessfulRemoteDataObject$(mdSchema);
 const mdField1 = Object.assign(new MetadataField(), {
-  schema: mdSchema,
+  schema: mdSchemaRD$,
   element: 'contributor',
   qualifier: 'author'
 });
-const mdField2 = Object.assign(new MetadataField(), { schema: mdSchema, element: 'title' });
+const mdField2 = Object.assign(new MetadataField(), {
+  schema: mdSchemaRD$,
+  element: 'title'
+});
 const mdField3 = Object.assign(new MetadataField(), {
-  schema: mdSchema,
+  schema: mdSchemaRD$,
   element: 'description',
-  qualifier: 'abstract'
+  qualifier: 'abstract',
 });
 
 const metadatum = Object.assign(new MetadatumViewModel(), {
@@ -56,7 +66,7 @@ describe('EditInPlaceFieldComponent', () => {
   beforeEach(async(() => {
     scheduler = getTestScheduler();
 
-    paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]);
+    paginatedMetadataFields = buildPaginatedList(undefined, [mdField1, mdField2, mdField3]);
 
     metadataFieldService = jasmine.createSpyObj({
       queryMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields),
@@ -74,11 +84,16 @@ describe('EditInPlaceFieldComponent', () => {
     );
 
     TestBed.configureTestingModule({
-      imports: [FormsModule, SharedModule, TranslateModule.forRoot()],
-      declarations: [EditInPlaceFieldComponent],
+      imports: [FormsModule, TranslateModule.forRoot()],
+      declarations: [
+        EditInPlaceFieldComponent,
+        MockDirective(DebounceDirective),
+        MockComponent(ValidationSuggestionsComponent)
+      ],
       providers: [
         { provide: RegistryService, useValue: metadataFieldService },
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
+        { provide: MetadataFieldDataService, useValue: {} }
       ], schemas: [
         CUSTOM_ELEMENTS_SCHEMA
       ]
@@ -94,13 +109,12 @@ describe('EditInPlaceFieldComponent', () => {
     comp.url = url;
     comp.fieldUpdate = fieldUpdate;
     comp.metadata = metadatum;
-
-    fixture.detectChanges();
   });
 
   describe('update', () => {
     beforeEach(() => {
       comp.update();
+      fixture.detectChanges();
     });
 
     it('it should call saveChangeFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
@@ -112,6 +126,7 @@ describe('EditInPlaceFieldComponent', () => {
     const editable = false;
     beforeEach(() => {
       comp.setEditable(editable);
+      fixture.detectChanges();
     });
 
     it('it should call setEditableFieldUpdate on the objectUpdatesService with the correct url and uuid and false', () => {
@@ -121,7 +136,7 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('editable is true', () => {
     beforeEach(() => {
-      comp.editable = observableOf(true);
+      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
       fixture.detectChanges();
     });
     it('the div should contain input fields or textareas', () => {
@@ -133,7 +148,7 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('editable is false', () => {
     beforeEach(() => {
-      comp.editable = observableOf(false);
+      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
       fixture.detectChanges();
     });
     it('the div should contain no input fields or textareas', () => {
@@ -145,7 +160,7 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('isValid is true', () => {
     beforeEach(() => {
-      comp.valid = observableOf(true);
+      objectUpdatesService.isValid.and.returnValue(observableOf(true));
       fixture.detectChanges();
     });
     it('the div should not contain an error message', () => {
@@ -157,10 +172,10 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('isValid is false', () => {
     beforeEach(() => {
-      comp.valid = observableOf(false);
+      objectUpdatesService.isValid.and.returnValue(observableOf(false));
       fixture.detectChanges();
     });
-    it('the div should contain no input fields or textareas', () => {
+    it('there should be an error message', () => {
       const errorMessages = de.queryAll(By.css('small.text-danger'));
       expect(errorMessages.length).toBeGreaterThan(0);
 
@@ -170,6 +185,7 @@ describe('EditInPlaceFieldComponent', () => {
   describe('remove', () => {
     beforeEach(() => {
       comp.remove();
+      fixture.detectChanges();
     });
 
     it('it should call saveRemoveFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
@@ -180,6 +196,7 @@ describe('EditInPlaceFieldComponent', () => {
   describe('removeChangesFromField', () => {
     beforeEach(() => {
       comp.removeChangesFromField();
+      fixture.detectChanges();
     });
 
     it('it should call removeChangesFromField on the objectUpdatesService with the correct url and uuid', () => {
@@ -192,19 +209,19 @@ describe('EditInPlaceFieldComponent', () => {
 
     const metadataFieldSuggestions: InputSuggestion[] =
       [
-        { displayValue: mdField1.toString().split('.').join('.&#8203;'), value: mdField1.toString() },
-        { displayValue: mdField2.toString().split('.').join('.&#8203;'), value: mdField2.toString() },
-        { displayValue: mdField3.toString().split('.').join('.&#8203;'), value: mdField3.toString() }
+        { displayValue: ('dc.' + mdField1.toString()).split('.').join('.&#8203;'), value: ('dc.' + mdField1.toString()) },
+        { displayValue: ('dc.' + mdField2.toString()).split('.').join('.&#8203;'), value: ('dc.' + mdField2.toString()) },
+        { displayValue: ('dc.' + mdField3.toString()).split('.').join('.&#8203;'), value: ('dc.' + mdField3.toString()) }
       ];
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       comp.findMetadataFieldSuggestions(query);
-
-    });
+      tick();
+      fixture.detectChanges();
+    }));
 
     it('it should call queryMetadataFields on the metadataFieldService with the correct query', () => {
-
-      expect(metadataFieldService.queryMetadataFields).toHaveBeenCalledWith(query);
+      expect(metadataFieldService.queryMetadataFields).toHaveBeenCalledWith(query, null, false, followLink('schema'));
     });
 
     it('it should set metadataFieldSuggestions to the right value', () => {
@@ -216,7 +233,8 @@ describe('EditInPlaceFieldComponent', () => {
   describe('canSetEditable', () => {
     describe('when editable is currently true', () => {
       beforeEach(() => {
-        comp.editable = observableOf(true);
+        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
+        fixture.detectChanges();
       });
 
       it('canSetEditable should return an observable emitting false', () => {
@@ -227,12 +245,14 @@ describe('EditInPlaceFieldComponent', () => {
 
     describe('when editable is currently false', () => {
       beforeEach(() => {
-        comp.editable = observableOf(false);
+        objectUpdatesService.isEditable.and.returnValue(observableOf(false));
+        fixture.detectChanges();
       });
 
       describe('when the fieldUpdate\'s changeType is currently not REMOVE', () => {
         beforeEach(() => {
           comp.fieldUpdate.changeType = FieldChangeType.ADD;
+          fixture.detectChanges();
         });
         it('canSetEditable should return an observable emitting true', () => {
           const expected = '(a|)';
@@ -243,6 +263,7 @@ describe('EditInPlaceFieldComponent', () => {
       describe('when the fieldUpdate\'s changeType is currently REMOVE', () => {
         beforeEach(() => {
           comp.fieldUpdate.changeType = FieldChangeType.REMOVE;
+          fixture.detectChanges();
         });
         it('canSetEditable should return an observable emitting false', () => {
           const expected = '(a|)';
@@ -255,7 +276,8 @@ describe('EditInPlaceFieldComponent', () => {
   describe('canSetUneditable', () => {
     describe('when editable is currently true', () => {
       beforeEach(() => {
-        comp.editable = observableOf(true);
+        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
+        fixture.detectChanges();
       });
 
       it('canSetUneditable should return an observable emitting true', () => {
@@ -266,7 +288,8 @@ describe('EditInPlaceFieldComponent', () => {
 
     describe('when editable is currently false', () => {
       beforeEach(() => {
-        comp.editable = observableOf(false);
+        objectUpdatesService.isEditable.and.returnValue(observableOf(false));
+        fixture.detectChanges();
       });
 
       it('canSetUneditable should return an observable emitting false', () => {
@@ -278,7 +301,7 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('when canSetEditable emits true', () => {
     beforeEach(() => {
-      comp.editable = observableOf(false);
+      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
       spyOn(comp, 'canSetEditable').and.returnValue(observableOf(true));
       fixture.detectChanges();
     });
@@ -290,7 +313,7 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('when canSetEditable emits false', () => {
     beforeEach(() => {
-      comp.editable = observableOf(false);
+      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
       spyOn(comp, 'canSetEditable').and.returnValue(observableOf(false));
       fixture.detectChanges();
     });
@@ -302,7 +325,7 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('when canSetUneditable emits true', () => {
     beforeEach(() => {
-      comp.editable = observableOf(true);
+      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
       spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(true));
       fixture.detectChanges();
     });
@@ -314,7 +337,7 @@ describe('EditInPlaceFieldComponent', () => {
 
   describe('when canSetUneditable emits false', () => {
     beforeEach(() => {
-      comp.editable = observableOf(true);
+      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
       spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(false));
       fixture.detectChanges();
     });
@@ -372,6 +395,7 @@ describe('EditInPlaceFieldComponent', () => {
     describe('when the fieldUpdate\'s changeType is currently not REMOVE or ADD', () => {
       beforeEach(() => {
         comp.fieldUpdate.changeType = FieldChangeType.UPDATE;
+        fixture.detectChanges();
       });
       it('canRemove should return an observable emitting true', () => {
         const expected = '(a|)';
@@ -382,6 +406,7 @@ describe('EditInPlaceFieldComponent', () => {
     describe('when the fieldUpdate\'s changeType is currently ADD', () => {
       beforeEach(() => {
         comp.fieldUpdate.changeType = FieldChangeType.ADD;
+        fixture.detectChanges();
       });
       it('canRemove should return an observable emitting false', () => {
         const expected = '(a|)';
@@ -394,7 +419,7 @@ describe('EditInPlaceFieldComponent', () => {
 
     describe('when editable is currently true', () => {
       beforeEach(() => {
-        comp.editable = observableOf(true);
+        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
         comp.fieldUpdate.changeType = undefined;
         fixture.detectChanges();
       });
@@ -408,6 +433,7 @@ describe('EditInPlaceFieldComponent', () => {
       describe('when the fieldUpdate\'s changeType is currently ADD, UPDATE or REMOVE', () => {
         beforeEach(() => {
           comp.fieldUpdate.changeType = FieldChangeType.ADD;
+          fixture.detectChanges();
         });
 
         it('canUndo should return an observable emitting true', () => {
@@ -419,6 +445,7 @@ describe('EditInPlaceFieldComponent', () => {
       describe('when the fieldUpdate\'s changeType is currently undefined', () => {
         beforeEach(() => {
           comp.fieldUpdate.changeType = undefined;
+          fixture.detectChanges();
         });
 
         it('canUndo should return an observable emitting false', () => {
diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
index 45eecc6e7e9..7c2ffecb0ac 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
@@ -1,16 +1,20 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
+import {
+  metadataFieldsToString,
+  getFirstSucceededRemoteData
+} from '../../../../core/shared/operators';
 import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { cloneDeep } from 'lodash';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
 import { FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { NgModel } from '@angular/forms';
 import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
-import { MetadataField } from '../../../../core/metadata/metadata-field.model';
 import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
 
 @Component({
   // tslint:disable-next-line:component-selector
@@ -32,15 +36,10 @@ export class EditInPlaceFieldComponent implements OnInit, OnChanges {
    */
   @Input() url: string;
 
-  /**
-   * List of strings with all metadata field keys available
-   */
-  @Input() metadataFields: string[];
-
   /**
    * The metadatum of this field
    */
-  metadata: MetadatumViewModel;
+  @Input() metadata: MetadatumViewModel;
 
   /**
    * Emits whether or not this field is currently editable
@@ -58,7 +57,7 @@ export class EditInPlaceFieldComponent implements OnInit, OnChanges {
   metadataFieldSuggestions: BehaviorSubject<InputSuggestion[]> = new BehaviorSubject([]);
 
   constructor(
-    private metadataFieldService: RegistryService,
+    private registryService: RegistryService,
     private objectUpdatesService: ObjectUpdatesService,
   ) {
   }
@@ -75,7 +74,7 @@ export class EditInPlaceFieldComponent implements OnInit, OnChanges {
    * Sends a new change update for this field to the object updates service
    */
   update(ngModel?: NgModel) {
-    this.objectUpdatesService.saveChangeFieldUpdate(this.url, this.metadata);
+    this.objectUpdatesService.saveChangeFieldUpdate(this.url, cloneDeep(this.metadata));
     if (hasValue(ngModel)) {
       this.checkValidity(ngModel);
     }
@@ -103,7 +102,7 @@ export class EditInPlaceFieldComponent implements OnInit, OnChanges {
    * Sends a new remove update for this field to the object updates service
    */
   remove() {
-    this.objectUpdatesService.saveRemoveFieldUpdate(this.url, this.metadata);
+    this.objectUpdatesService.saveRemoveFieldUpdate(this.url, cloneDeep(this.metadata));
   }
 
   /**
@@ -123,29 +122,37 @@ export class EditInPlaceFieldComponent implements OnInit, OnChanges {
   /**
    * Requests all metadata fields that contain the query string in their key
    * Then sets all found metadata fields as metadataFieldSuggestions
+   * Ignores fields from metadata schemas "relation" and "relationship"
    * @param query The query to look for
    */
-  findMetadataFieldSuggestions(query: string): void {
+  findMetadataFieldSuggestions(query: string) {
     if (isNotEmpty(query)) {
-      this.metadataFieldService.queryMetadataFields(query).pipe(
-        // getSucceededRemoteData(),
-        take(1),
-        map((data) => data.payload.page)
-      ).subscribe(
-        (fields: MetadataField[]) => this.metadataFieldSuggestions.next(
-          fields.map((field: MetadataField) => {
-            return {
-              displayValue: field.toString().split('.').join('.&#8203;'),
-              value: field.toString()
-            };
-          })
-        )
-      );
+      return this.registryService.queryMetadataFields(query, null, false, followLink('schema')).pipe(
+        getFirstSucceededRemoteData(),
+        metadataFieldsToString(),
+      ).subscribe((fieldNames: string[]) => {
+          this.setInputSuggestions(fieldNames);
+        })
     } else {
       this.metadataFieldSuggestions.next([]);
     }
   }
 
+  /**
+   * Set the list of input suggestion with the given Metadata fields, which all require a resolved MetadataSchema
+   * @param fields  list of Metadata fields, which all require a resolved MetadataSchema
+   */
+  setInputSuggestions(fields: string[]) {
+    this.metadataFieldSuggestions.next(
+      fields.map((fieldName: string) => {
+        return {
+          displayValue: fieldName.split('.').join('.&#8203;'),
+          value: fieldName
+        };
+      })
+    );
+  }
+
   /**
    * Check if a user should be allowed to edit this field
    * @return an observable that emits true when the user should be able to edit this field and false when they should not
diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.html
index 496429a3ba0..b743ef27451 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.html
+++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.html
@@ -1,5 +1,5 @@
 <div class="item-metadata">
-    <div class="button-row top d-flex">
+    <div class="button-row top d-flex mb-2">
         <button class="mr-auto btn btn-success"
                 (click)="add()"><i
                 class="fas fa-plus"></i>
@@ -16,13 +16,13 @@
                 class="fas fa-undo-alt"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
-        <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
+        <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !(isValid() | async)"
                 (click)="submit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
         </button>
     </div>
-    <table class="table table-responsive table-striped table-bordered">
+    <table class="table table-responsive table-striped table-bordered" *ngIf="((updates$ | async)| dsObjectValues).length > 0">
         <tbody>
         <tr>
             <th>{{'item.edit.metadata.headers.field' | translate}}</th>
@@ -33,7 +33,6 @@
         <tr *ngFor="let updateValue of ((updates$ | async)| dsObjectValues); trackBy: trackUpdate"
             ds-edit-in-place-field
             [fieldUpdate]="updateValue || {}"
-            [metadataFields]="metadataFields$ | async"
             [url]="url"
             [ngClass]="{
                 'table-warning': updateValue.changeType === 0,
@@ -44,21 +43,24 @@
         </tr>
         </tbody>
     </table>
-    <div class="button-row bottom">
-        <div class="my-2 float-right">
-            <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                    [disabled]="!(hasChanges() | async)"
-                    (click)="discard()"><i
-                    class="fas fa-times"></i> {{"item.edit.metadata.discard-button" | translate}}
-            </button>
-            <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-                    (click)="reinstate()"><i
-                    class="fas fa-undo-alt"></i> {{"item.edit.metadata.reinstate-button" | translate}}
-            </button>
-            <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-                    (click)="submit()"><i
-                    class="fas fa-save"></i> {{"item.edit.metadata.save-button" | translate}}
-            </button>
-        </div>
+    <div *ngIf="((updates$ | async)| dsObjectValues).length == 0">
+      <ds-alert [content]="'item.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
     </div>
+    <div class="button-row bottom">
+          <div class="float-right">
+              <button class="btn btn-danger mr-1" *ngIf="!(isReinstatable() | async)"
+                      [disabled]="!(hasChanges() | async)"
+                      (click)="discard()"><i
+                      class="fas fa-times"></i> {{"item.edit.metadata.discard-button" | translate}}
+              </button>
+              <button class="btn btn-warning mr-1" *ngIf="isReinstatable() | async"
+                      (click)="reinstate()"><i
+                      class="fas fa-undo-alt"></i> {{"item.edit.metadata.reinstate-button" | translate}}
+              </button>
+              <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
+                      (click)="submit()"><i
+                      class="fas fa-save"></i> {{"item.edit.metadata.save-button" | translate}}
+              </button>
+          </div>
+      </div>
 </div>
diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
index 37a75d60900..62c1aa70d11 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
@@ -21,14 +21,15 @@ import { Item } from '../../../core/shared/item.model';
 import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
 import { MetadatumViewModel } from '../../../core/shared/metadata.models';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { Metadata } from '../../../core/shared/metadata.utils';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import {
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
 } from '../../../shared/remote-data.utils';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { DSOSuccessResponse } from '../../../core/cache/response.models';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 let comp: any;
 let fixture: ComponentFixture<ItemMetadataComponent>;
@@ -43,6 +44,7 @@ const router = new RouterStub();
 let metadataFieldService;
 let paginatedMetadataFields;
 let routeStub;
+let objectCacheService;
 
 const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' });
 const mdField1 = Object.assign(new MetadataField(), {
@@ -101,6 +103,8 @@ const fieldUpdate3 = {
   changeType: undefined
 };
 
+const operation1 = { op: 'remove', path: '/metadata/dc.title/1' };
+
 let scheduler: TestScheduler;
 let item;
 describe('ItemMetadataComponent', () => {
@@ -119,14 +123,17 @@ describe('ItemMetadataComponent', () => {
       ;
       itemService = jasmine.createSpyObj('itemService', {
         update: createSuccessfulRemoteDataObject$(item),
-        commitUpdates: {}
+        commitUpdates: {},
+        patch: observableOf(new DSOSuccessResponse(['item-selflink'], 200, 'OK')),
+        findByHref: createSuccessfulRemoteDataObject$(item)
       });
       routeStub = {
+        data: observableOf({}),
         parent: {
-          data: observableOf({ item: createSuccessfulRemoteDataObject(item) })
+          data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
         }
       };
-      paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]);
+      paginatedMetadataFields = createPaginatedList([mdField1, mdField2, mdField3]);
 
       metadataFieldService = jasmine.createSpyObj({
         getAllMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields)
@@ -147,9 +154,13 @@ describe('ItemMetadataComponent', () => {
           getLastModified: observableOf(date),
           hasUpdates: observableOf(true),
           isReinstatable: observableOf(false), // should always return something --> its in ngOnInit
-          isValidPage: observableOf(true)
+          isValidPage: observableOf(true),
+          createPatch: observableOf([
+            operation1
+          ])
         }
       );
+      objectCacheService = jasmine.createSpyObj('objectCacheService', ['addPatch']);
 
       TestBed.configureTestingModule({
         imports: [SharedModule, TranslateModule.forRoot()],
@@ -161,6 +172,7 @@ describe('ItemMetadataComponent', () => {
           { provide: ActivatedRoute, useValue: routeStub },
           { provide: NotificationsService, useValue: notificationsService },
           { provide: RegistryService, useValue: metadataFieldService },
+          { provide: ObjectCacheService, useValue: objectCacheService },
         ], schemas: [
           NO_ERRORS_SCHEMA
         ]
@@ -214,8 +226,8 @@ describe('ItemMetadataComponent', () => {
     });
 
     it('it should call reinstateFieldUpdates on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.getUpdatedFields).toHaveBeenCalledWith(url, comp.item.metadataAsList);
-      expect(itemService.update).toHaveBeenCalledWith(Object.assign(comp.item, { metadata: Metadata.toMetadataMap(comp.item.metadataAsList) }));
+      expect(objectUpdatesService.createPatch).toHaveBeenCalledWith(url);
+      expect(itemService.patch).toHaveBeenCalledWith(comp.item, [ operation1 ]);
       expect(objectUpdatesService.getFieldUpdates).toHaveBeenCalledWith(url, comp.item.metadataAsList);
     });
   });
diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
index 77e772b0b66..ea095e0e01f 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
@@ -1,21 +1,21 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { cloneDeep } from 'lodash';
-import { Observable } from 'rxjs';
-import { Identifiable } from '../../../core/data/object-updates/object-updates.reducer';
-import { first, map, switchMap, take, tap } from 'rxjs/operators';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { first, switchMap } from 'rxjs/operators';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { MetadatumViewModel } from '../../../core/shared/metadata.models';
-import { Metadata } from '../../../core/shared/metadata.utils';
+import { MetadataValue, MetadatumViewModel } from '../../../core/shared/metadata.models';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { UpdateDataService } from '../../../core/data/update-data.service';
+import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { AlertType } from '../../../shared/alert/aletr-type';
+import { Operation } from 'fast-json-patch';
+import { MetadataPatchOperationService } from '../../../core/data/object-updates/patch-operation-service/metadata-patch-operation.service';
 
 @Component({
   selector: 'ds-item-metadata',
@@ -28,9 +28,16 @@ import { MetadataField } from '../../../core/metadata/metadata-field.model';
 export class ItemMetadataComponent extends AbstractItemUpdateComponent {
 
   /**
-   * Observable with a list of strings with all existing metadata field keys
+   * The AlertType enumeration
+   * @type {AlertType}
    */
-  metadataFields$: Observable<string[]>;
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * A custom update service to use for adding and committing patches
+   * This will default to the ItemDataService
+   */
+  @Input() updateService: UpdateDataService<Item>;
 
   constructor(
     public itemService: ItemDataService,
@@ -39,7 +46,6 @@ export class ItemMetadataComponent extends AbstractItemUpdateComponent {
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
     public route: ActivatedRoute,
-    public metadataFieldService: RegistryService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
@@ -49,7 +55,9 @@ export class ItemMetadataComponent extends AbstractItemUpdateComponent {
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.metadataFields$ = this.findMetadataFields();
+    if (hasNoValue(this.updateService)) {
+      this.updateService = this.itemService;
+    }
   }
 
   /**
@@ -78,7 +86,7 @@ export class ItemMetadataComponent extends AbstractItemUpdateComponent {
    * Sends all initial values of this item to the object updates service
    */
   public initializeOriginalFields() {
-    this.objectUpdatesService.initialize(this.url, this.item.metadataAsList, this.item.lastModified);
+    this.objectUpdatesService.initialize(this.url, this.item.metadataAsList, this.item.lastModified, MetadataPatchOperationService);
   }
 
   /**
@@ -88,21 +96,24 @@ export class ItemMetadataComponent extends AbstractItemUpdateComponent {
   public submit() {
     this.isValid().pipe(first()).subscribe((isValid) => {
       if (isValid) {
-        const metadata$: Observable<Identifiable[]> = this.objectUpdatesService.getUpdatedFields(this.url, this.getMetadataAsListExcludingRelationships()) as Observable<MetadatumViewModel[]>;
-        metadata$.pipe(
+        this.objectUpdatesService.createPatch(this.url).pipe(
           first(),
-          switchMap((metadata: MetadatumViewModel[]) => {
-            const updatedItem: Item = Object.assign(cloneDeep(this.item), { metadata: Metadata.toMetadataMap(metadata) });
-            return this.itemService.update(updatedItem);
-          }),
-          tap(() => this.itemService.commitUpdates()),
-          getSucceededRemoteData()
+          switchMap((patch: Operation[]) => {
+            return this.updateService.patch(this.item, patch).pipe(
+              getFirstCompletedRemoteData()
+            );
+          })
         ).subscribe(
           (rd: RemoteData<Item>) => {
-            this.item = rd.payload;
-            this.initializeOriginalFields();
-            this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.getMetadataAsListExcludingRelationships());
-            this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
+            if (rd.hasFailed) {
+              this.notificationsService.error(this.getNotificationTitle('error'), rd.errorMessage);
+            } else {
+              this.item = rd.payload;
+              this.checkAndFixMetadataUUIDs();
+              this.initializeOriginalFields();
+              this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadataAsList);
+              this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
+            }
           }
         )
       } else {
@@ -112,16 +123,13 @@ export class ItemMetadataComponent extends AbstractItemUpdateComponent {
   }
 
   /**
-   * Method to request all metadata fields and convert them to a list of strings
+   * Check for empty metadata UUIDs and fix them (empty UUIDs would break the object-update service)
    */
-  findMetadataFields(): Observable<string[]> {
-    return this.metadataFieldService.getAllMetadataFields().pipe(
-      getSucceededRemoteData(),
-      take(1),
-      map((remoteData$) => remoteData$.payload.page.map((field: MetadataField) => field.toString())));
-  }
-
-  getMetadataAsListExcludingRelationships(): MetadatumViewModel[] {
-    return this.item.metadataAsList.filter((metadata: MetadatumViewModel) => !metadata.key.startsWith('relation.') && !metadata.key.startsWith('relationship.'));
+  checkAndFixMetadataUUIDs() {
+    const metadata = cloneDeep(this.item.metadata);
+    Object.keys(this.item.metadata).forEach((key: string) => {
+      metadata[key] = this.item.metadata[key].map((value) => hasValue(value.uuid) ? value : Object.assign(new MetadataValue(), value));
+    });
+    this.item.metadata = metadata;
   }
 }
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index 77aefe2356c..7f9b53f7bac 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -7,10 +7,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../../../core/cache/response.models';
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
@@ -18,6 +15,12 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { ItemMoveComponent } from './item-move.component';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 describe('ItemMoveComponent', () => {
   let comp: ItemMoveComponent;
@@ -34,44 +37,43 @@ describe('ItemMoveComponent', () => {
     url: `${itemPageUrl}/edit`
   });
 
+  const collection1 = Object.assign(new Collection(), {
+    uuid: 'collection-uuid-1',
+    name: 'Test collection 1'
+  });
+
+  const collection2 = Object.assign(new Collection(), {
+    uuid: 'collection-uuid-2',
+    name: 'Test collection 2'
+  });
+
   const mockItemDataService = jasmine.createSpyObj({
-    moveToCollection: observableOf(new RestResponse(true, 200, 'Success'))
+    moveToCollection: createSuccessfulRemoteDataObject$(collection1)
   });
 
   const mockItemDataServiceFail = jasmine.createSpyObj({
-    moveToCollection: observableOf(new RestResponse(false, 500, 'Internal server error'))
+    moveToCollection: createFailedRemoteDataObject$('Internal server error', 500)
   });
 
   const routeStub = {
     data: observableOf({
-      item: new RemoteData(false, false, true, null, {
+      dso: createSuccessfulRemoteDataObject({
         id: 'item1'
       })
     })
   };
 
-  const collection1 = Object.assign(new Collection(), {
-    uuid: 'collection-uuid-1',
-    name: 'Test collection 1'
-  });
-
-  const collection2 = Object.assign(new Collection(), {
-    uuid: 'collection-uuid-2',
-    name: 'Test collection 2'
-  });
-
   const mockSearchService = {
     search: () => {
-      return observableOf(new RemoteData(false, false, true, null,
-        new PaginatedList(null, [
-          {
-            indexableObject: collection1,
-            hitHighlights: {}
-          }, {
-            indexableObject: collection2,
-            hitHighlights: {}
-          }
-        ])));
+      return createSuccessfulRemoteDataObject$(createPaginatedList([
+        {
+          indexableObject: collection1,
+          hitHighlights: {}
+        }, {
+          indexableObject: collection2,
+          hitHighlights: {}
+        }
+      ]));
     }
   };
 
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index 4db7cf94dad..cdff5e1fbc8 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -3,21 +3,23 @@ import { first, map } from 'rxjs/operators';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
+import {
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { getItemEditPath } from '../../item-page-routing.module';
 import { Observable, of as observableOf } from 'rxjs';
-import { RestResponse } from '../../../core/cache/response.models';
 import { Collection } from '../../../core/shared/collection.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
 import { SearchResult } from '../../../shared/search/search-result.model';
+import { getItemEditRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-move',
@@ -55,7 +57,7 @@ export class ItemMoveComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.data.pipe(map((data) => data.item), getSucceededRemoteData()) as Observable<RemoteData<Item>>;
+    this.itemRD$ = this.route.data.pipe(map((data) => data.dso), getFirstSucceededRemoteData()) as Observable<RemoteData<Item>>;
     this.itemRD$.subscribe((rd) => {
         this.itemId = rd.payload.id;
       }
@@ -79,7 +81,7 @@ export class ItemMoveComponent implements OnInit {
   loadSuggestions(query): void {
     this.collectionSearchResults = this.searchService.search(new PaginatedSearchOptions({
       pagination: this.pagination,
-      dsoType: DSpaceObjectType.COLLECTION,
+      dsoTypes: [DSpaceObjectType.COLLECTION],
       query: query
     })).pipe(
       first(),
@@ -114,10 +116,10 @@ export class ItemMoveComponent implements OnInit {
    */
   moveCollection() {
     this.processing = true;
-    this.itemDataService.moveToCollection(this.itemId, this.selectedCollection).pipe(first()).subscribe(
-      (response: RestResponse) => {
-        this.router.navigate([getItemEditPath(this.itemId)]);
-        if (response.isSuccessful) {
+    this.itemDataService.moveToCollection(this.itemId, this.selectedCollection).pipe(getFirstCompletedRemoteData()).subscribe(
+      (response: RemoteData<Collection>) => {
+        this.router.navigate([getItemEditRoute(this.itemId)]);
+        if (response.hasSucceeded) {
           this.notificationsService.success(this.translateService.get('item.edit.move.success'));
         } else {
           this.notificationsService.error(this.translateService.get('item.edit.move.error'));
diff --git a/src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts b/src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts
new file mode 100644
index 00000000000..9bb99feaa2b
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { DsoPageFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring reinstate rights
+ */
+export class ItemPageReinstateGuard extends DsoPageFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check reinstate authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.ReinstateItem);
+  }
+}
diff --git a/src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts b/src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts
new file mode 100644
index 00000000000..b0bd1820bba
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts
@@ -0,0 +1,32 @@
+import { DsoPageFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard';
+import { Item } from '../../core/shared/item.model';
+import { Injectable } from '@angular/core';
+import { ItemPageResolver } from '../item-page.resolver';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring withdraw rights
+ */
+export class ItemPageWithdrawGuard extends DsoPageFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check withdraw authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.WithdrawItem);
+  }
+}
diff --git a/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts b/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
index 95b08a99365..d8a615d2186 100644
--- a/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
@@ -16,7 +15,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemPrivateComponent } from './item-private.component';
 import { RestResponse } from '../../../core/cache/response.models';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 let comp: ItemPrivateComponent;
 let fixture: ComponentFixture<ItemPrivateComponent>;
@@ -46,14 +45,12 @@ describe('ItemPrivateComponent', () => {
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setDiscoverable: observableOf(new RestResponse(true, 200, 'OK'))
+      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem)
     });
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
-          id: 'fake-id'
-        })
+        dso: createSuccessfulRemoteDataObject(mockItem)
       })
     };
 
@@ -98,9 +95,8 @@ describe('ItemPrivateComponent', () => {
       spyOn(comp, 'processRestResponse');
       comp.performAction();
 
-      expect(mockItemDataService.setDiscoverable).toHaveBeenCalledWith(mockItem.id, false);
+      expect(mockItemDataService.setDiscoverable).toHaveBeenCalledWith(mockItem, false);
       expect(comp.processRestResponse).toHaveBeenCalled();
     });
   });
-})
-;
+});
diff --git a/src/app/+item-page/edit-item-page/item-private/item-private.component.ts b/src/app/+item-page/edit-item-page/item-private/item-private.component.ts
index d949e4fa6e2..02a7f997bf7 100644
--- a/src/app/+item-page/edit-item-page/item-private/item-private.component.ts
+++ b/src/app/+item-page/edit-item-page/item-private/item-private.component.ts
@@ -1,9 +1,8 @@
 import { Component } from '@angular/core';
-import { first } from 'rxjs/operators';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { RestResponse } from '../../../core/cache/response.models';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-item-private',
@@ -21,9 +20,9 @@ export class ItemPrivateComponent extends AbstractSimpleItemActionComponent {
    * Perform the make private action to the item
    */
   performAction() {
-    this.itemDataService.setDiscoverable(this.item.id, false).pipe(first()).subscribe(
-      (response: RestResponse) => {
-        this.processRestResponse(response);
+    this.itemDataService.setDiscoverable(this.item, false).pipe(getFirstCompletedRemoteData()).subscribe(
+      (rd: RemoteData<Item>) => {
+        this.processRestResponse(rd);
       }
     );
   }
diff --git a/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts b/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
index 53df20bf04f..dbc948de8ca 100644
--- a/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
@@ -15,8 +14,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemPublicComponent } from './item-public.component';
-import { RestResponse } from '../../../core/cache/response.models';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 let comp: ItemPublicComponent;
 let fixture: ComponentFixture<ItemPublicComponent>;
@@ -27,8 +25,6 @@ let routerStub;
 let mockItemDataService: ItemDataService;
 let routeStub;
 let notificationsServiceStub;
-let successfulRestResponse;
-let failRestResponse;
 
 describe('ItemPublicComponent', () => {
   beforeEach(async(() => {
@@ -46,14 +42,12 @@ describe('ItemPublicComponent', () => {
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setDiscoverable: observableOf(new RestResponse(true, 200, 'OK'))
+      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem)
     });
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
-          id: 'fake-id'
-        })
+        dso: createSuccessfulRemoteDataObject(mockItem)
       })
     };
 
@@ -74,9 +68,6 @@ describe('ItemPublicComponent', () => {
   }));
 
   beforeEach(() => {
-    successfulRestResponse = new RestResponse(true, 200, 'OK');
-    failRestResponse = new RestResponse(false, 500, 'Internal Server Error');
-
     fixture = TestBed.createComponent(ItemPublicComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
@@ -98,9 +89,8 @@ describe('ItemPublicComponent', () => {
       spyOn(comp, 'processRestResponse');
       comp.performAction();
 
-      expect(mockItemDataService.setDiscoverable).toHaveBeenCalledWith(mockItem.id, true);
+      expect(mockItemDataService.setDiscoverable).toHaveBeenCalledWith(mockItem, true);
       expect(comp.processRestResponse).toHaveBeenCalled();
     });
   });
-})
-;
+});
diff --git a/src/app/+item-page/edit-item-page/item-public/item-public.component.ts b/src/app/+item-page/edit-item-page/item-public/item-public.component.ts
index 272cf9a96f3..dcadc8bac31 100644
--- a/src/app/+item-page/edit-item-page/item-public/item-public.component.ts
+++ b/src/app/+item-page/edit-item-page/item-public/item-public.component.ts
@@ -1,9 +1,8 @@
 import { Component } from '@angular/core';
-import { first } from 'rxjs/operators';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { RestResponse } from '../../../core/cache/response.models';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-item-public',
@@ -21,8 +20,8 @@ export class ItemPublicComponent extends AbstractSimpleItemActionComponent {
    * Perform the make public action to the item
    */
   performAction() {
-    this.itemDataService.setDiscoverable(this.item.id, true).pipe(first()).subscribe(
-      (response: RestResponse) => {
+    this.itemDataService.setDiscoverable(this.item, true).pipe(getFirstCompletedRemoteData()).subscribe(
+      (response: RemoteData<Item>) => {
         this.processRestResponse(response);
       }
     );
diff --git a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts b/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
index 5e75b592920..e6cf6bc3745 100644
--- a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
@@ -15,8 +14,10 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemReinstateComponent } from './item-reinstate.component';
-import { RestResponse } from '../../../core/cache/response.models';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
 
 let comp: ItemReinstateComponent;
 let fixture: ComponentFixture<ItemReinstateComponent>;
@@ -27,8 +28,6 @@ let routerStub;
 let mockItemDataService: ItemDataService;
 let routeStub;
 let notificationsServiceStub;
-let successfulRestResponse;
-let failRestResponse;
 
 describe('ItemReinstateComponent', () => {
   beforeEach(async(() => {
@@ -46,12 +45,12 @@ describe('ItemReinstateComponent', () => {
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setWithDrawn: observableOf(new RestResponse(true, 200, 'OK'))
+      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem)
     });
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
+        dso: createSuccessfulRemoteDataObject({
           id: 'fake-id'
         })
       })
@@ -74,9 +73,6 @@ describe('ItemReinstateComponent', () => {
   }));
 
   beforeEach(() => {
-    successfulRestResponse = new RestResponse(true, 200, 'OK');
-    failRestResponse = new RestResponse(false, 500, 'Internal Server Error');
-
     fixture = TestBed.createComponent(ItemReinstateComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
@@ -98,9 +94,8 @@ describe('ItemReinstateComponent', () => {
       spyOn(comp, 'processRestResponse');
       comp.performAction();
 
-      expect(mockItemDataService.setWithDrawn).toHaveBeenCalledWith(mockItem.id, false);
+      expect(mockItemDataService.setWithDrawn).toHaveBeenCalledWith(comp.item, false);
       expect(comp.processRestResponse).toHaveBeenCalled();
     });
   });
-})
-;
+});
diff --git a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts b/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
index 9c0e1c8d055..cfebcb16f1b 100644
--- a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
+++ b/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
@@ -1,9 +1,8 @@
 import { Component } from '@angular/core';
-import { first } from 'rxjs/operators';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { RestResponse } from '../../../core/cache/response.models';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-item-reinstate',
@@ -21,8 +20,8 @@ export class ItemReinstateComponent extends AbstractSimpleItemActionComponent {
    * Perform the reinstate action to the item
    */
   performAction() {
-    this.itemDataService.setWithDrawn(this.item.id, false).pipe(first()).subscribe(
-      (response: RestResponse) => {
+    this.itemDataService.setWithDrawn(this.item, false).pipe(getFirstCompletedRemoteData()).subscribe(
+      (response: RemoteData<Item>) => {
         this.processRestResponse(response);
       }
     );
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 1a7cc2e2df0..5583de5fd5a 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,15 +1,26 @@
-<h5>{{getRelationshipMessageKey() | async | translate}}</h5>
+<h5>
+    {{getRelationshipMessageKey() | async | translate}}
+    <button class="ml-2 btn btn-success" (click)="openLookup()">
+        <i class="fas fa-plus"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
+    </button>
+</h5>
 <ng-container *ngVar="updates$ | async as updates">
     <ng-container *ngIf="updates">
         <ng-container *ngVar="updates | dsObjectValues as updateValues">
             <ds-edit-relationship *ngFor="let updateValue of updateValues; trackBy: trackUpdate"
-                                  class="relationship-row d-block"
-                                  [fieldUpdate]="updateValue"
+                                  class="relationship-row d-block alert"
+                                  [fieldUpdate]="updateValue || {}"
                                   [url]="url"
                                   [editItem]="item"
-                                  [ngClass]="{'alert alert-danger': updateValue?.changeType === 2}">
+                                  [ngClass]="{
+                                        'alert-success': updateValue.changeType === 1,
+                                        'alert-warning': updateValue.changeType === 0,
+                                        'alert-danger': updateValue.changeType === 2
+                                  }">
             </ds-edit-relationship>
+            <div *ngIf="updateValues.length === 0">{{"item.edit.relationships.no-relationships" | translate}}</div>
         </ng-container>
     </ng-container>
-    <div *ngIf="!updates">no relationships</div>
+    <ds-loading *ngIf="!updates"></ds-loading>
 </ng-container>
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss
index e0c20d299f8..54498499d7a 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss
@@ -1,8 +1,8 @@
-.relationship-row:not(.alert-danger) {
+.relationship-row:not(.alert) {
   padding: $alert-padding-y 0;
 }
 
-.relationship-row.alert-danger {
+.relationship-row.alert {
   margin-left: -$alert-padding-x;
   margin-right: -$alert-padding-x;
   margin-top: -1px;
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 1d4d91da0b6..009f1e7fc52 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -1,183 +1,177 @@
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RelationshipTypeService } from '../../../../core/data/relationship-type.service';
-import { RemoteData } from '../../../../core/data/remote-data';
+import { RelationshipService } from '../../../../core/data/relationship.service';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { getMockLinkService } from '../../../../shared/mocks/link-service.mock';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
 import { SharedModule } from '../../../../shared/shared.module';
 import { EditRelationshipListComponent } from './edit-relationship-list.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 
 let comp: EditRelationshipListComponent;
 let fixture: ComponentFixture<EditRelationshipListComponent>;
 let de: DebugElement;
 
+let linkService;
 let objectUpdatesService;
-let entityTypeService;
+let relationshipService;
+let selectableListService;
 
 const url = 'http://test-url.com/test-url';
 
 let item;
+let entityType;
+let relatedEntityType;
 let author1;
 let author2;
 let fieldUpdate1;
 let fieldUpdate2;
-let relationship1;
-let relationship2;
+let relationships;
 let relationshipType;
-let entityType;
-let relatedEntityType;
 
 describe('EditRelationshipListComponent', () => {
 
-  beforeEach(() => {
+  beforeEach(async(() => {
 
     entityType = Object.assign(new ItemType(), {
-      id: 'entityType',
+      id: 'Publication',
+      uuid: 'Publication',
+      label: 'Publication',
     });
 
     relatedEntityType = Object.assign(new ItemType(), {
-      id: 'relatedEntityType',
+      id: 'Author',
+      uuid: 'Author',
+      label: 'Author',
     });
 
     relationshipType = Object.assign(new RelationshipType(), {
       id: '1',
       uuid: '1',
+      leftType: createSuccessfulRemoteDataObject$(entityType),
+      rightType: createSuccessfulRemoteDataObject$(relatedEntityType),
       leftwardType: 'isAuthorOfPublication',
       rightwardType: 'isPublicationOfAuthor',
-      leftType: observableOf(new RemoteData(false, false, true, undefined, entityType)),
-      rightType: observableOf(new RemoteData(false, false, true, undefined, relatedEntityType)),
     });
 
-    relationship1 = Object.assign(new Relationship(), {
-      _links: {
-        self: {
-          href: url + '/2'
-        }
-      },
-      id: '2',
-      uuid: '2',
-      leftId: 'author1',
-      rightId: 'publication',
-      leftItem: observableOf(new RemoteData(false, false, true, undefined, item)),
-      rightItem: observableOf(new RemoteData(false, false, true, undefined, author1)),
-      relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+    author1 = Object.assign(new Item(), {
+      id: 'author1',
+      uuid: 'author1'
     });
-
-    relationship2 = Object.assign(new Relationship(), {
-      _links: {
-        self: {
-          href: url + '/3'
-        }
-      },
-      id: '3',
-      uuid: '3',
-      leftId: 'author2',
-      rightId: 'publication',
-      leftItem: observableOf(new RemoteData(false, false, true, undefined, item)),
-      rightItem: observableOf(new RemoteData(false, false, true, undefined, author2)),
-      relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+    author2 = Object.assign(new Item(), {
+      id: 'author2',
+      uuid: 'author2'
     });
 
+    relationships = [
+      Object.assign(new Relationship(), {
+        self: url + '/2',
+        id: '2',
+        uuid: '2',
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
+        leftItem: createSuccessfulRemoteDataObject$(item),
+        rightItem: createSuccessfulRemoteDataObject$(author1),
+      }),
+      Object.assign(new Relationship(), {
+        self: url + '/3',
+        id: '3',
+        uuid: '3',
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
+        leftItem: createSuccessfulRemoteDataObject$(item),
+        rightItem: createSuccessfulRemoteDataObject$(author2),
+      })
+    ];
+
     item = Object.assign(new Item(), {
       _links: {
         self: { href: 'fake-item-url/publication' }
       },
       id: 'publication',
       uuid: 'publication',
-      relationships: observableOf(new RemoteData(
-        false,
-        false,
-        true,
-        undefined,
-        new PaginatedList(new PageInfo(), [relationship1, relationship2])
-      ))
-    });
-
-    author1 = Object.assign(new Item(), {
-      id: 'author1',
-      uuid: 'author1'
-    });
-    author2 = Object.assign(new Item(), {
-      id: 'author2',
-      uuid: 'author2'
+      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
     });
 
     fieldUpdate1 = {
-      field: author1,
+      field: {
+        uuid: relationships[0].uuid,
+        relationship: relationships[0],
+        type: relationshipType,
+      },
       changeType: undefined
     };
     fieldUpdate2 = {
-      field: author2,
+      field: {
+        uuid: relationships[1].uuid,
+        relationship: relationships[1],
+        type: relationshipType,
+      },
       changeType: FieldChangeType.REMOVE
     };
 
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
       {
         getFieldUpdates: observableOf({
-          [author1.uuid]: fieldUpdate1,
-          [author2.uuid]: fieldUpdate2
+          [relationships[0].uuid]: fieldUpdate1,
+          [relationships[1].uuid]: fieldUpdate2
         })
       }
     );
 
-    entityTypeService = jasmine.createSpyObj('entityTypeService',
+    relationshipService = jasmine.createSpyObj('relationshipService',
       {
-        getEntityTypeByLabel: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          entityType,
-        )),
-        getEntityTypeRelationships: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          new PaginatedList(new PageInfo(), [relationshipType]),
-        )),
+        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([author1, author2])),
+        getItemRelationshipsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
+        isLeftItem: observableOf(true),
       }
     );
 
+    selectableListService = {};
+
+    linkService = {
+      resolveLink: () => null,
+      resolveLinks: () => null,
+    };
+
     TestBed.configureTestingModule({
       imports: [SharedModule, TranslateModule.forRoot()],
       declarations: [EditRelationshipListComponent],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: RelationshipTypeService, useValue: {} },
-        { provide: LinkService, useValue: getMockLinkService() },
+        { provide: RelationshipService, useValue: relationshipService },
+        { provide: SelectableListService, useValue: selectableListService },
+        { provide: LinkService, useValue: linkService },
       ], schemas: [
         NO_ERRORS_SCHEMA
       ]
     }).compileComponents();
+  }));
 
+  beforeEach(() => {
     fixture = TestBed.createComponent(EditRelationshipListComponent);
     comp = fixture.componentInstance;
     de = fixture.debugElement;
-
     comp.item = item;
     comp.itemType = entityType;
     comp.url = url;
     comp.relationshipType = relationshipType;
-
     fixture.detectChanges();
   });
 
   describe('changeType is REMOVE', () => {
-    it('the div should have class alert-danger', () => {
-
+    beforeEach(() => {
       fieldUpdate1.changeType = FieldChangeType.REMOVE;
+      fixture.detectChanges();
+    });
+    it('the div should have class alert-danger', () => {
       const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement;
       expect(element.classList).toContain('alert-danger');
     });
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index c17762e4a0c..d77a14e2f40 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,21 +1,35 @@
 import { Component, Input, OnInit } from '@angular/core';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { Observable } from 'rxjs/internal/Observable';
-import {FieldUpdate, FieldUpdates} from '../../../../core/data/object-updates/object-updates.reducer';
-import {Item} from '../../../../core/shared/item.model';
-import { map, switchMap, tap } from 'rxjs/operators';
-import {hasValue} from '../../../../shared/empty.util';
-import {Relationship} from '../../../../core/shared/item-relationships/relationship.model';
-import {RelationshipType} from '../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  FieldUpdate,
+  FieldUpdates,
+  RelationshipIdentifiable
+} from '../../../../core/data/object-updates/object-updates.reducer';
+import { RelationshipService } from '../../../../core/data/relationship.service';
+import { Item } from '../../../../core/shared/item.model';
+import { defaultIfEmpty, flatMap, map, switchMap, take, } from 'rxjs/operators';
+import { hasValue, hasValueOperator } from '../../../../shared/empty.util';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import {
   getAllSucceededRemoteData,
   getRemoteDataPayload,
-  getSucceededRemoteData
+  getFirstSucceededRemoteData,
 } from '../../../../core/shared/operators';
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import { combineLatest as observableCombineLatest, of } from 'rxjs';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model';
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import { SearchResult } from '../../../../shared/search/search-result.model';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -46,14 +60,29 @@ export class EditRelationshipListComponent implements OnInit {
    */
   @Input() relationshipType: RelationshipType;
 
+  private relatedEntityType$: Observable<ItemType>;
+
+  /**
+   * The list ID to save selected entities under
+   */
+  listId: string;
+
   /**
    * The FieldUpdates for the relationships in question
    */
   updates$: Observable<FieldUpdates>;
 
+  /**
+   * A reference to the lookup window
+   */
+  modalRef: NgbModalRef;
+
   constructor(
     protected objectUpdatesService: ObjectUpdatesService,
-    protected linkService: LinkService
+    protected linkService: LinkService,
+    protected relationshipService: RelationshipService,
+    protected modalService: NgbModal,
+    protected selectableListService: SelectableListService,
   ) {
   }
 
@@ -62,10 +91,18 @@ export class EditRelationshipListComponent implements OnInit {
    */
   public getRelationshipMessageKey(): Observable<string> {
 
-    return this.getLabel().pipe(
-      map((label) => {
-        if (hasValue(label) && label.indexOf('Of') > -1) {
-          return `relationships.${label.substring(0, label.indexOf('Of') + 2)}`
+    return observableCombineLatest(
+      this.getLabel(),
+      this.relatedEntityType$,
+    ).pipe(
+      map(([label, relatedEntityType]) => {
+        if (hasValue(label) && label.indexOf('is') > -1 && label.indexOf('Of') > -1) {
+          const relationshipLabel = `${label.substring(2, label.indexOf('Of'))}`;
+          if (relationshipLabel !== relatedEntityType.label) {
+            return `relationships.is${relationshipLabel}Of.${relatedEntityType.label}`
+          } else {
+            return `relationships.is${relationshipLabel}Of`
+          }
         } else {
           return label;
         }
@@ -77,15 +114,14 @@ export class EditRelationshipListComponent implements OnInit {
    * Get the relevant label for this relationship type
    */
   private getLabel(): Observable<string> {
-
     return observableCombineLatest([
       this.relationshipType.leftType,
       this.relationshipType.rightType,
     ].map((itemTypeRD) => itemTypeRD.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     ))).pipe(
-      map((itemTypes) => [
+      map((itemTypes: ItemType[]) => [
         this.relationshipType.leftwardType,
         this.relationshipType.rightwardType,
       ][itemTypes.findIndex((itemType) => itemType.id === this.itemType.id)]),
@@ -99,38 +135,210 @@ export class EditRelationshipListComponent implements OnInit {
     return update && update.field ? update.field.uuid : undefined;
   }
 
-  ngOnInit(): void {
-    this.updates$ = this.item.relationships.pipe(
-      getAllSucceededRemoteData(),
-      map((relationships) => relationships.payload.page.filter((relationship) => relationship)),
-      map((relationships: Relationship[]) =>
-        relationships.map((relationship: Relationship) => {
-          this.linkService.resolveLinks(
-            relationship,
-            followLink('relationshipType'),
-            followLink('leftItem'),
-            followLink('rightItem'),
+  /**
+   * Open the dynamic lookup modal to search for items to add as relationships
+   */
+  openLookup() {
+
+    this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
+      size: 'lg'
+    });
+    const modalComp: DsDynamicLookupRelationModalComponent = this.modalRef.componentInstance;
+    modalComp.repeatable = true;
+    modalComp.listId = this.listId;
+    modalComp.item = this.item;
+    modalComp.select = (...selectableObjects: Array<SearchResult<Item>>) => {
+      selectableObjects.forEach((searchResult) => {
+        const relatedItem: Item = searchResult.indexableObject;
+        this.getFieldUpdatesForRelatedItem(relatedItem)
+          .subscribe((identifiables) => {
+            identifiables.forEach((identifiable) =>
+              this.objectUpdatesService.removeSingleFieldUpdate(this.url, identifiable.uuid)
+            );
+            if (identifiables.length === 0) {
+              this.relationshipService.getNameVariant(this.listId, relatedItem.uuid)
+                .subscribe((nameVariant) => {
+                  const update = {
+                    uuid: this.relationshipType.id + '-' + relatedItem.uuid,
+                    nameVariant,
+                    type: this.relationshipType,
+                    relatedItem,
+                  } as RelationshipIdentifiable;
+                  this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
+                })
+            }
+          });
+      })
+    };
+    modalComp.deselect = (...selectableObjects: Array<SearchResult<Item>>) => {
+      selectableObjects.forEach((searchResult) => {
+        const relatedItem: Item = searchResult.indexableObject;
+        this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.relationshipType.id + '-' + relatedItem.uuid);
+        this.getFieldUpdatesForRelatedItem(relatedItem)
+          .subscribe((identifiables) =>
+            identifiables.forEach((identifiable) =>
+              this.objectUpdatesService.saveRemoveFieldUpdate(this.url, identifiable)
+            )
           );
-          return relationship;
-        })
+      })
+    };
+    this.relatedEntityType$
+      .pipe(take(1))
+      .subscribe((relatedEntityType) => {
+        modalComp.relationshipOptions = Object.assign(
+          new RelationshipOptions(), {
+            relationshipType: relatedEntityType.label,
+            // filter: this.getRelationshipMessageKey(),
+            searchConfiguration: relatedEntityType.label.toLowerCase(),
+            nameVariants: true,
+          }
+        );
+      });
+
+    this.selectableListService.deselectAll(this.listId);
+    this.updates$.pipe(
+      switchMap((updates) =>
+        Object.values(updates).length > 0 ?
+          observableCombineLatest(
+            Object.values(updates)
+              .filter((update) => update.changeType !== FieldChangeType.REMOVE)
+              .map((update) => {
+                const field = update.field as RelationshipIdentifiable;
+                if (field.relationship) {
+                  return this.getRelatedItem(field.relationship);
+                } else {
+                  return of(field.relatedItem);
+                }
+              })
+          ) : of([])
       ),
+      take(1),
+      map((items) => items.map((item) => {
+        const searchResult = new ItemSearchResult();
+        searchResult.indexableObject = item;
+        searchResult.hitHighlights = {};
+        return searchResult;
+      })),
+    ).subscribe((items) => {
+      this.selectableListService.select(this.listId, items);
+    });
+  }
+
+  /**
+   * Get the existing field updates regarding a relationship with a given item
+   * @param relatedItem The item for which to get the existing field updates
+   */
+  private getFieldUpdatesForRelatedItem(relatedItem: Item): Observable<RelationshipIdentifiable[]> {
+
+    return this.updates$.pipe(
+      take(1),
+      map((updates) => Object.values(updates)
+        .map((update) => update.field as RelationshipIdentifiable)
+        .filter((field) => field.relationship)
+      ),
+      flatMap((identifiables) =>
+        observableCombineLatest(
+          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship))
+        ).pipe(
+          defaultIfEmpty([]),
+          map((relatedItems) =>
+            identifiables.filter((identifiable, index) => relatedItems[index].uuid === relatedItem.uuid)
+          ),
+        )
+      ),
+    );
+  }
+
+  /**
+   * Get the related item for a given relationship
+   * @param relationship  The relationship for which to get the related item
+   */
+  private getRelatedItem(relationship: Relationship): Observable<Item> {
+    return this.relationshipService.isLeftItem(relationship, this.item).pipe(
+      switchMap((isLeftItem) => isLeftItem ? relationship.rightItem : relationship.leftItem),
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    ) as Observable<Item>
+  }
+
+  ngOnInit(): void {
+
+    this.relatedEntityType$ =
+      observableCombineLatest([
+        this.relationshipType.leftType,
+        this.relationshipType.rightType,
+      ].map((type) => type.pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+      ))).pipe(
+        map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
+        hasValueOperator()
+      );
+
+    this.relatedEntityType$.pipe(
+      take(1)
+    ).subscribe(
+      (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
+    );
+
+    this.updates$ = this.getItemRelationships().pipe(
+      switchMap((relationships) =>
+        observableCombineLatest(
+          relationships.map((relationship) => this.relationshipService.isLeftItem(relationship, this.item))
+        ).pipe(
+          defaultIfEmpty([]),
+          map((isLeftItemArray) => isLeftItemArray.map((isLeftItem, index) => {
+            const relationship = relationships[index];
+            const nameVariant = isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
+            return {
+              uuid: relationship.id,
+              type: this.relationshipType,
+              relationship,
+              nameVariant,
+            } as RelationshipIdentifiable
+          })),
+        )),
+      switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields).pipe(
+        map((fieldUpdates) => {
+          const fieldUpdatesFiltered: FieldUpdates = {};
+          Object.keys(fieldUpdates).forEach((uuid) => {
+            if (hasValue(fieldUpdates[uuid])) {
+              const field = fieldUpdates[uuid].field;
+              if ((field as RelationshipIdentifiable).type.id === this.relationshipType.id) {
+                fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
+              }
+            }
+          });
+          return fieldUpdatesFiltered;
+        }),
+      )),
+    );
+  }
+
+  private getItemRelationships() {
+    this.linkService.resolveLink(this.item,
+      followLink('relationships', undefined, true,
+        followLink('relationshipType'),
+        followLink('leftItem'),
+        followLink('rightItem'),
+      ));
+    return this.item.relationships.pipe(
+      getAllSucceededRemoteData(),
+      map((relationships: RemoteData<PaginatedList<Relationship>>) => relationships.payload.page.filter((relationship: Relationship) => hasValue(relationship))),
       switchMap((itemRelationships: Relationship[]) =>
         observableCombineLatest(
           itemRelationships
             .map((relationship) => relationship.relationshipType.pipe(
-              getSucceededRemoteData(),
+              getFirstSucceededRemoteData(),
               getRemoteDataPayload(),
             ))
         ).pipe(
+          defaultIfEmpty([]),
           map((relationshipTypes) => itemRelationships.filter(
             (relationship, index) => relationshipTypes[index].id === this.relationshipType.id)
           ),
-          map((relationships) => relationships.map((relationship) =>
-            Object.assign(new Relationship(), relationship, {uuid: relationship.id})
-          )),
         )
       ),
-      switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields)),
     );
   }
 }
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index 7e61e8958f4..e65cd237a34 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -1,6 +1,11 @@
 <div class="row" *ngIf="relatedItem$ | async">
   <div class="col-10 relationship">
-    <ds-listable-object-component-loader [object]="relatedItem$ | async" [viewMode]="viewMode"></ds-listable-object-component-loader>
+    <ds-listable-object-component-loader
+      [object]="relatedItem$ | async"
+      [viewMode]="viewMode"
+      [value]="nameVariant"
+    >
+    </ds-listable-object-component-loader>
   </div>
   <div class="col-2">
     <div class="btn-group relationship-action-buttons">
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
index 9eca3f270d7..667c811c07d 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
@@ -1,17 +1,16 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RemoteData } from '../../../../core/data/remote-data';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
 import { EditRelationshipComponent } from './edit-relationship.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 
 let objectUpdatesService;
 const url = 'http://test-url.com/test-url';
@@ -25,7 +24,7 @@ let fieldUpdate2;
 let relationships;
 let relationshipType;
 
-let fixture;
+let fixture: ComponentFixture<EditRelationshipComponent>;
 let comp: EditRelationshipComponent;
 let de;
 let el;
@@ -49,7 +48,7 @@ describe('EditRelationshipComponent', () => {
       },
       id: 'publication',
       uuid: 'publication',
-      relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships)))
+      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
     });
 
     relatedItem = Object.assign(new Item(), {
@@ -65,9 +64,9 @@ describe('EditRelationshipComponent', () => {
         uuid: '2',
         leftId: 'author1',
         rightId: 'publication',
-        relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)),
-        leftItem: observableOf(new RemoteData(false, false, true, undefined, relatedItem)),
-        rightItem: observableOf(new RemoteData(false, false, true, undefined, item)),
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
+        leftItem: createSuccessfulRemoteDataObject$(relatedItem),
+        rightItem: createSuccessfulRemoteDataObject$(item),
       }),
       Object.assign(new Relationship(), {
         _links: {
@@ -77,7 +76,7 @@ describe('EditRelationshipComponent', () => {
         uuid: '3',
         leftId: 'author2',
         rightId: 'publication',
-        relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
       })
     ];
 
@@ -91,11 +90,17 @@ describe('EditRelationshipComponent', () => {
     });
 
     fieldUpdate1 = {
-      field: relationships[0],
+      field: {
+        uuid: relationships[0].uuid,
+        relationship: relationships[0],
+      },
       changeType: undefined
     };
     fieldUpdate2 = {
-      field: relationships[1],
+      field: {
+        uuid: relationships[1].uuid,
+        relationship: relationships[1],
+      },
       changeType: FieldChangeType.REMOVE
     };
 
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index 2badaf80b0a..502eb136fcf 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -1,12 +1,15 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
 import { filter, map, switchMap, take, tap } from 'rxjs/operators';
 import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
-import { DeleteRelationship, FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer';
+import {
+  DeleteRelationship,
+  FieldUpdate,
+  RelationshipIdentifiable
+} from '../../../../core/data/object-updates/object-updates.reducer';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
@@ -36,8 +39,16 @@ export class EditRelationshipComponent implements OnChanges {
   /**
    * The relationship being edited
    */
-  get relationship(): Relationship {
-    return this.fieldUpdate.field as Relationship;
+  get relationship() {
+    return this.update.relationship;
+  }
+
+  get update() {
+    return this.fieldUpdate.field as RelationshipIdentifiable;
+  }
+
+  get nameVariant() {
+    return this.update.nameVariant;
   }
 
   public leftItem$: Observable<Item>;
@@ -68,24 +79,28 @@ export class EditRelationshipComponent implements OnChanges {
    * Sets the current relationship based on the fieldUpdate input field
    */
   ngOnChanges(): void {
-    this.leftItem$ = this.relationship.leftItem.pipe(
-      getSucceededRemoteData(),
-      getRemoteDataPayload(),
-      filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
-    );
-    this.rightItem$ = this.relationship.rightItem.pipe(
-      getSucceededRemoteData(),
-      getRemoteDataPayload(),
-      filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
-    );
-    this.relatedItem$ = observableCombineLatest(
-      this.leftItem$,
-      this.rightItem$,
-    ).pipe(
-      map((items: Item[]) =>
-        items.find((item) => item.uuid !== this.editItem.uuid)
-      )
-    );
+    if (this.relationship) {
+      this.leftItem$ = this.relationship.leftItem.pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+      );
+      this.rightItem$ = this.relationship.rightItem.pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+      );
+      this.relatedItem$ = observableCombineLatest(
+        this.leftItem$,
+        this.rightItem$,
+      ).pipe(
+        map((items: Item[]) =>
+          items.find((item) => item.uuid !== this.editItem.uuid)
+        )
+      );
+    } else {
+      this.relatedItem$ = of(this.update.relatedItem);
+    }
   }
 
   /**
@@ -136,7 +151,8 @@ export class EditRelationshipComponent implements OnChanges {
    * Check if a user should be allowed to remove this field
    */
   canRemove(): boolean {
-    return this.fieldUpdate.changeType !== FieldChangeType.REMOVE;
+    return this.fieldUpdate.changeType !== FieldChangeType.REMOVE
+      && this.fieldUpdate.changeType !== FieldChangeType.ADD;
   }
 
   /**
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html
index 384a469f24f..7692494fd8c 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -1,48 +1,61 @@
 <div class="item-relationships">
-  <div class="button-row top d-flex">
-    <button class="btn btn-danger ml-auto" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async)"
-            (click)="discard()"><i
-      class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-    </button>
-    <button class="btn btn-warning ml-auto" *ngIf="isReinstatable() | async"
-            (click)="reinstate()"><i
-      class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-    </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-            (click)="submit()"><i
-      class="fas fa-save"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-    </button>
-  </div>
-  <div *ngFor="let relationshipType of relationshipTypes$ | async" class="mb-4">
-    <ds-edit-relationship-list
-            [url]="url"
-            [item]="item"
-            [itemType]="entityType$ | async"
-            [relationshipType]="relationshipType"
-    ></ds-edit-relationship-list>
-  </div>
-  <div class="button-row bottom">
-    <div class="float-right">
-      <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async)"
-              (click)="discard()"><i
-        class="fas fa-times"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-      </button>
-      <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-              (click)="reinstate()"><i
-        class="fas fa-undo-alt"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-      </button>
-      <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-              (click)="submit()"><i
-        class="fas fa-save"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-      </button>
+  <ng-container *ngVar="entityType$ | async as entityType">
+    <ng-container *ngIf="entityType">
+      <div class="button-row top d-flex">
+        <button class="btn btn-danger ml-auto" *ngIf="!(isReinstatable() | async)"
+                [disabled]="!(hasChanges() | async)"
+                (click)="discard()"><i
+          class="fas fa-times"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
+        </button>
+        <button class="btn btn-warning ml-auto" *ngIf="isReinstatable() | async"
+                (click)="reinstate()"><i
+          class="fas fa-undo-alt"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
+        </button>
+        <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
+                (click)="submit()"><i
+          class="fas fa-save"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
+        </button>
+      </div>
+      <ng-container *ngVar="relationshipTypes$ | async as relationshipTypes">
+        <ng-container *ngIf="relationshipTypes">
+          <div *ngFor="let relationshipType of relationshipTypes" class="mb-4">
+            <ds-edit-relationship-list
+              [url]="url"
+              [item]="item"
+              [itemType]="entityType$ | async"
+              [relationshipType]="relationshipType"
+            ></ds-edit-relationship-list>
+          </div>
+        </ng-container>
+        <ds-loading *ngIf="!relationshipTypes"></ds-loading>
+      </ng-container>
+      <div class="button-row bottom">
+        <div class="float-right">
+          <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
+                  [disabled]="!(hasChanges() | async)"
+                  (click)="discard()"><i
+            class="fas fa-times"></i>
+            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
+          </button>
+          <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+                  (click)="reinstate()"><i
+            class="fas fa-undo-alt"></i>
+            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
+          </button>
+          <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
+                  (click)="submit()"><i
+            class="fas fa-save"></i>
+            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
+          </button>
+        </div>
+      </div>
+    </ng-container>
+    <div *ngIf="!entityType"
+         class="alert alert-info mt-2" role="alert">
+      {{ 'item.edit.relationships.no-entity-type' | translate }}
     </div>
-  </div>
+  </ng-container>
 </div>
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index a2b18a4bce6..4e5b14ffe0a 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -11,7 +11,6 @@ import { EntityTypeService } from '../../../core/data/entity-type.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { PaginatedList } from '../../../core/data/paginated-list';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
@@ -29,6 +28,8 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { SharedModule } from '../../../shared/shared.module';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { ItemRelationshipsComponent } from './item-relationships.component';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 let comp: any;
 let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -84,7 +85,7 @@ describe('ItemRelationshipsComponent', () => {
         },
         id: '2',
         uuid: '2',
-        relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
       }),
       Object.assign(new Relationship(), {
         _links: {
@@ -92,7 +93,7 @@ describe('ItemRelationshipsComponent', () => {
         },
         id: '3',
         uuid: '3',
-        relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
       })
     ];
 
@@ -102,7 +103,7 @@ describe('ItemRelationshipsComponent', () => {
       },
       id: 'publication',
       uuid: 'publication',
-      relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships))),
+      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
       lastModified: date
     });
 
@@ -119,10 +120,10 @@ describe('ItemRelationshipsComponent', () => {
       uuid: 'author2'
     });
 
-    relationships[0].leftItem = observableOf(new RemoteData(false, false, true, undefined, author1));
-    relationships[0].rightItem = observableOf(new RemoteData(false, false, true, undefined, item));
-    relationships[1].leftItem = observableOf(new RemoteData(false, false, true, undefined, author2));
-    relationships[1].rightItem = observableOf(new RemoteData(false, false, true, undefined, item));
+    relationships[0].leftItem = createSuccessfulRemoteDataObject$(author1);
+    relationships[0].rightItem = createSuccessfulRemoteDataObject$(item);
+    relationships[1].leftItem = createSuccessfulRemoteDataObject$(author2);
+    relationships[1].rightItem = createSuccessfulRemoteDataObject$(item);
 
     fieldUpdate1 = {
       field: relationships[0],
@@ -137,11 +138,12 @@ describe('ItemRelationshipsComponent', () => {
     };
 
     itemService = jasmine.createSpyObj('itemService', {
-      findById: observableOf(new RemoteData(false, false, true, undefined, item))
+      findById: createSuccessfulRemoteDataObject$(item)
     });
     routeStub = {
+      data: observableOf({}),
       parent: {
-        data: observableOf({ item: new RemoteData(false, false, true, null, item) })
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
       }
     };
 
@@ -183,7 +185,7 @@ describe('ItemRelationshipsComponent', () => {
     requestService = jasmine.createSpyObj('requestService',
       {
         removeByHrefSubstring: {},
-        hasByHrefObservable: observableOf(false)
+        hasByHref$: observableOf(false)
       }
     );
 
@@ -193,20 +195,8 @@ describe('ItemRelationshipsComponent', () => {
 
     entityTypeService = jasmine.createSpyObj('entityTypeService',
       {
-        getEntityTypeByLabel: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          entityType,
-        )),
-        getEntityTypeRelationships: observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          null,
-          new PaginatedList(new PageInfo(), [relationshipType]),
-        )),
+        getEntityTypeByLabel: createSuccessfulRemoteDataObject$(entityType),
+        getEntityTypeRelationships: createSuccessfulRemoteDataObject$(createPaginatedList([relationshipType])),
       }
     );
 
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 2634b4e262c..8298eebe9d4 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,9 +1,18 @@
-import { ChangeDetectorRef, Component, Inject, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Component } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
-import { DeleteRelationship, FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer';
+import {
+  DeleteRelationship,
+  FieldUpdate,
+  FieldUpdates,
+  RelationshipIdentifiable,
+} from '../../../core/data/object-updates/object-updates.reducer';
 import { Observable } from 'rxjs/internal/Observable';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { zip as observableZip } from 'rxjs';
+import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+  zip as observableZip
+} from 'rxjs';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 import { ItemDataService } from '../../../core/data/item-data.service';
@@ -12,18 +21,17 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { RelationshipService } from '../../../core/data/relationship.service';
-import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { RequestService } from '../../../core/data/request.service';
-import { Subscription } from 'rxjs/internal/Subscription';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { EntityTypeService } from '../../../core/data/entity-type.service';
-import { isNotEmptyOperator } from '../../../shared/empty.util';
 import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { hasValue } from '../../../shared/empty.util';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -33,18 +41,18 @@ import { Relationship } from '../../../core/shared/item-relationships/relationsh
 /**
  * Component for displaying an item's relationships edit page
  */
-export class ItemRelationshipsComponent extends AbstractItemUpdateComponent implements OnDestroy {
+export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
+
+  itemRD$: Observable<RemoteData<Item>>;
 
   /**
-   * The labels of all different relations within this item
+   * The allowed relationship types for this type of item as an observable list
    */
   relationshipTypes$: Observable<RelationshipType[]>;
 
   /**
-   * A subscription that checks when the item is deleted in cache and reloads the item by sending a new request
-   * This is used to update the item in cache after relationships are deleted
+   * The item's entity type as an observable
    */
-  itemUpdateSubscription: Subscription;
   entityType$: Observable<ItemType>;
 
   constructor(
@@ -68,15 +76,30 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.itemUpdateSubscription = this.requestService.hasByHrefObservable(this.item.self).pipe(
+    this.initializeItemUpdate();
+  }
+
+  /**
+   * Update the item (and view) when it's removed in the request cache
+   */
+  public initializeItemUpdate(): void {
+    this.itemRD$ = this.requestService.hasByHref$(this.item.self).pipe(
       filter((exists: boolean) => !exists),
-      switchMap(() => this.itemService.findById(this.item.uuid,
+      switchMap(() => this.itemService.findById(
+        this.item.uuid,
+        true,
         followLink('owningCollection'),
         followLink('bundles'),
-        followLink('relationships'))),
-      getSucceededRemoteData(),
-    ).subscribe((itemRD: RemoteData<Item>) => {
-      this.item = itemRD.payload;
+        followLink('relationships')),
+      ),
+      filter((itemRD) => !!itemRD.statusCode),
+    );
+
+    this.itemRD$.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    ).subscribe((item) => {
+      this.item = item;
       this.cdr.detectChanges();
       this.initializeUpdates();
     });
@@ -87,26 +110,30 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
    */
   public initializeUpdates(): void {
 
-    this.entityType$ = this.entityTypeService.getEntityTypeByLabel(
-      this.item.firstMetadataValue('relationship.type')
-    ).pipe(
-      getSucceededRemoteData(),
-      getRemoteDataPayload(),
-    );
+    const label = this.item.firstMetadataValue('relationship.type');
+    if (label !== undefined) {
 
-    this.relationshipTypes$ = this.entityType$.pipe(
-      switchMap((entityType) =>
-        this.entityTypeService.getEntityTypeRelationships(
-          entityType.id,
-          followLink('leftType'),
-          followLink('rightType'))
-        .pipe(
-          getSucceededRemoteData(),
-          getRemoteDataPayload(),
-          map((relationshipTypes) => relationshipTypes.page),
-        )
-      ),
-    );
+      this.entityType$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+      );
+
+      this.relationshipTypes$ = this.entityType$.pipe(
+        switchMap((entityType) =>
+          this.entityTypeService.getEntityTypeRelationships(
+            entityType.id,
+            followLink('leftType'),
+            followLink('rightType'))
+            .pipe(
+              getFirstSucceededRemoteData(),
+              getRemoteDataPayload(),
+              map((relationshipTypes) => relationshipTypes.page),
+            )
+        ),
+      );
+    } else {
+      this.entityType$ = observableOf(undefined);
+    }
   }
 
   /**
@@ -121,10 +148,12 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
    * Make sure the lists are refreshed afterwards and notifications are sent for success and errors
    */
   public submit(): void {
+
     // Get all the relationships that should be removed
-    this.relationshipService.getItemRelationshipsArray(this.item).pipe(
+    const removedRelationshipIDs$: Observable<DeleteRelationship[]> = this.relationshipService.getItemRelationshipsArray(this.item).pipe(
+      startWith([]),
       map((relationships: Relationship[]) => relationships.map((relationship) =>
-        Object.assign(new Relationship(), relationship, {uuid: relationship.id})
+        Object.assign(new Relationship(), relationship, { uuid: relationship.id })
       )),
       switchMap((relationships: Relationship[]) => {
         return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable<FieldUpdates>
@@ -134,61 +163,109 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
           .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)
           .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship)
       ),
-      isNotEmptyOperator(),
+    );
+
+    const addRelatedItems$: Observable<RelationshipIdentifiable[]> = this.objectUpdatesService.getFieldUpdates(this.url, []).pipe(
+      map((fieldUpdates: FieldUpdates) =>
+        Object.values(fieldUpdates)
+          .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
+          .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD)
+          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable)
+      ),
+    );
+
+    observableCombineLatest(
+      removedRelationshipIDs$,
+      addRelatedItems$,
+    ).pipe(
       take(1),
-      switchMap((deleteRelationships: DeleteRelationship[]) =>
-        observableZip(...deleteRelationships.map((deleteRelationship) => {
-            let copyVirtualMetadata: string;
-            if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
-              copyVirtualMetadata = 'all';
-            } else if (deleteRelationship.keepLeftVirtualMetadata) {
-              copyVirtualMetadata = 'left';
-            } else if (deleteRelationship.keepRightVirtualMetadata) {
-              copyVirtualMetadata = 'right';
-            } else {
-              copyVirtualMetadata = 'none';
-            }
-            return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata);
+    ).subscribe(([removeRelationshipIDs, addRelatedItems]) => {
+      const actions = [
+        this.deleteRelationships(removeRelationshipIDs),
+        this.addRelationships(addRelatedItems),
+      ];
+      actions.forEach((action) =>
+        action.subscribe((response) => {
+          if (response.length > 0) {
+            this.itemRD$.subscribe(() => {
+              this.initializeOriginalFields();
+              this.cdr.detectChanges();
+              this.displayNotifications(response);
+            });
           }
-        ))
-      ),
-    ).subscribe((responses: RestResponse[]) => {
-      this.itemUpdateSubscription.add(() => {
-        this.displayNotifications(responses);
-      });
+        })
+      );
     });
   }
 
+  deleteRelationships(deleteRelationshipIDs: DeleteRelationship[]): Observable<Array<RemoteData<NoContent>>> {
+    return observableZip(...deleteRelationshipIDs.map((deleteRelationship) => {
+        let copyVirtualMetadata: string;
+        if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
+          copyVirtualMetadata = 'all';
+        } else if (deleteRelationship.keepLeftVirtualMetadata) {
+          copyVirtualMetadata = 'left';
+        } else if (deleteRelationship.keepRightVirtualMetadata) {
+          copyVirtualMetadata = 'right';
+        } else {
+          copyVirtualMetadata = 'none';
+        }
+        return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata);
+      }
+    ));
+  }
+
+  addRelationships(addRelatedItems: RelationshipIdentifiable[]): Observable<Array<RemoteData<Relationship>>> {
+    return observableZip(...addRelatedItems.map((addRelationship) =>
+      this.entityType$.pipe(
+        switchMap((entityType) => this.entityTypeService.isLeftType(addRelationship.type, entityType)),
+        switchMap((isLeftType) => {
+          let leftItem: Item;
+          let rightItem: Item;
+          let leftwardValue: string;
+          let rightwardValue: string;
+          if (isLeftType) {
+            leftItem = this.item;
+            rightItem = addRelationship.relatedItem;
+            leftwardValue = null;
+            rightwardValue = addRelationship.nameVariant;
+          } else {
+            leftItem = addRelationship.relatedItem;
+            rightItem = this.item;
+            leftwardValue = addRelationship.nameVariant;
+            rightwardValue = null;
+          }
+          return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue);
+        }),
+      )
+    ));
+  }
+
   /**
    * Display notifications
    * - Error notification for each failed response with their message
    * - Success notification in case there's at least one successful response
    * @param responses
    */
-  displayNotifications(responses: RestResponse[]) {
-    const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
-    const successfulResponses = responses.filter((response: RestResponse) => response.isSuccessful);
+  displayNotifications(responses: Array<RemoteData<NoContent>>) {
+    const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
+    const successfulResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
 
-    failedResponses.forEach((response: ErrorResponse) => {
+    failedResponses.forEach((response: RemoteData<NoContent>) => {
       this.notificationsService.error(this.getNotificationTitle('failed'), response.errorMessage);
     });
     if (successfulResponses.length > 0) {
       this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
     }
   }
-
   /**
    * Sends all initial values of this item to the object updates service
    */
   public initializeOriginalFields() {
-    const initialFields = [];
-    this.objectUpdatesService.initialize(this.url, initialFields, this.item.lastModified);
-  }
-
-  /**
-   * Unsubscribe from the item update when the component is destroyed
-   */
-  ngOnDestroy(): void {
-    this.itemUpdateSubscription.unsubscribe();
+    return this.relationshipService.getRelatedItems(this.item).pipe(
+      take(1),
+    ).subscribe((items: Item[]) => {
+      this.objectUpdatesService.initialize(this.url, items, this.item.lastModified);
+    });
   }
 }
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.html b/src/app/+item-page/edit-item-page/item-status/item-status.component.html
index 83662c9d7c1..3fcf10a2f52 100644
--- a/src/app/+item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.html
@@ -15,7 +15,7 @@
     <a [routerLink]="getItemPage((itemRD$ | async)?.payload)">{{getItemPage((itemRD$ | async)?.payload)}}</a>
   </div>
 
-  <div *ngFor="let operation of operations" class="w-100 pt-3">
-    <ds-item-operation [operation]="operation"></ds-item-operation>
+  <div *ngFor="let operation of (operations$ | async)" class="w-100" [ngClass]="{'pt-3': operation}">
+    <ds-item-operation *ngIf="operation" [operation]="operation"></ds-item-operation>
   </div>
 </div>
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
index abb28395514..f9053df7675 100644
--- a/src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
@@ -12,6 +12,7 @@ import { By } from '@angular/platform-browser';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { of as observableOf } from 'rxjs';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 
 describe('ItemStatusComponent', () => {
   let comp: ItemStatusComponent;
@@ -20,24 +21,34 @@ describe('ItemStatusComponent', () => {
   const mockItem = Object.assign(new Item(), {
     id: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
+    _links: {
+      self: { href: 'test-item-selflink' }
+    }
   });
 
   const itemPageUrl = `items/${mockItem.id}`;
 
   const routeStub = {
       parent: {
-        data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
       }
     };
 
+  let authorizationService: AuthorizationDataService;
+
   beforeEach(async(() => {
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [ItemStatusComponent],
       providers: [
         { provide: ActivatedRoute, useValue: routeStub },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: AuthorizationDataService, useValue: authorizationService },
       ], schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
   }));
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
index e63154918b8..3cd885ddca6 100644
--- a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
@@ -3,15 +3,19 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute } from '@angular/router';
 import { ItemOperation } from '../item-operation/itemOperation.model';
-import { first, map } from 'rxjs/operators';
+import { distinctUntilChanged, first, map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
-import { getItemEditPath, getItemPageRoute } from '../../item-page-routing.module';
+import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { hasValue } from '../../../shared/empty.util';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 
 @Component({
   selector: 'ds-item-status',
   templateUrl: './item-status.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
+  changeDetection: ChangeDetectionStrategy.Default,
   animations: [
     fadeIn,
     fadeInOut
@@ -40,18 +44,19 @@ export class ItemStatusComponent implements OnInit {
    * The possible actions that can be performed on the item
    *  key: id   value: url to action's component
    */
-  operations: ItemOperation[];
+  operations$: BehaviorSubject<ItemOperation[]> = new BehaviorSubject<ItemOperation[]>([]);
 
   /**
    * The keys of the actions (to loop over)
    */
   actionsKeys;
 
-  constructor(private route: ActivatedRoute) {
+  constructor(private route: ActivatedRoute,
+              private authorizationService: AuthorizationDataService) {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.parent.data.pipe(map((data) => data.item));
+    this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso));
     this.itemRD$.pipe(
       first(),
       map((data: RemoteData<Item>) => data.payload)
@@ -67,20 +72,43 @@ export class ItemStatusComponent implements OnInit {
           i18n example: 'item.edit.tabs.status.buttons.<key>.label'
         The value is supposed to be a href for the button
       */
-      this.operations = [];
-      this.operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper'));
-      if (item.isWithdrawn) {
-        this.operations.push(new ItemOperation('reinstate', this.getCurrentUrl(item) + '/reinstate'));
+      const operations = [];
+      operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations'));
+      operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper'));
+      operations.push(undefined);
+      // Store the index of the "withdraw" or "reinstate" operation, because it's added asynchronously
+      const indexOfWithdrawReinstate = operations.length - 1;
+      if (item.isDiscoverable) {
+        operations.push(new ItemOperation('private', this.getCurrentUrl(item) + '/private'));
       } else {
-        this.operations.push(new ItemOperation('withdraw', this.getCurrentUrl(item) + '/withdraw'));
+        operations.push(new ItemOperation('public', this.getCurrentUrl(item) + '/public'));
       }
-      if (item.isDiscoverable) {
-        this.operations.push(new ItemOperation('private', this.getCurrentUrl(item) + '/private'));
+      operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete'));
+      operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move'));
+
+      this.operations$.next(operations);
+
+      if (item.isWithdrawn) {
+        this.authorizationService.isAuthorized(FeatureID.ReinstateItem, item.self).pipe(distinctUntilChanged()).subscribe((authorized) => {
+          const newOperations = [...this.operations$.value];
+          if (authorized) {
+            newOperations[indexOfWithdrawReinstate] = new ItemOperation('reinstate', this.getCurrentUrl(item) + '/reinstate');
+          } else {
+            newOperations[indexOfWithdrawReinstate] = undefined;
+          }
+          this.operations$.next(newOperations);
+        });
       } else {
-        this.operations.push(new ItemOperation('public', this.getCurrentUrl(item) + '/public'));
+        this.authorizationService.isAuthorized(FeatureID.WithdrawItem, item.self).pipe(distinctUntilChanged()).subscribe((authorized) => {
+          const newOperations = [...this.operations$.value];
+          if (authorized) {
+            newOperations[indexOfWithdrawReinstate] = new ItemOperation('withdraw', this.getCurrentUrl(item) + '/withdraw');
+          } else {
+            newOperations[indexOfWithdrawReinstate] = undefined;
+          }
+          this.operations$.next(newOperations);
+        });
       }
-      this.operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete'));
-      this.operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move'));
     });
 
   }
@@ -98,7 +126,11 @@ export class ItemStatusComponent implements OnInit {
    * @returns {string}  url
    */
   getCurrentUrl(item: Item): string {
-    return getItemEditPath(item.id);
+    return getItemEditRoute(item.id);
+  }
+
+  trackOperation(index: number, operation: ItemOperation) {
+    return hasValue(operation) ? operation.operationKey : undefined;
   }
 
 }
diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
index 60419f92f49..4d5de65428e 100644
--- a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
@@ -23,7 +23,7 @@ describe('ItemVersionHistoryComponent', () => {
       declarations: [ItemVersionHistoryComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ item: createSuccessfulRemoteDataObject(item) }) } } }
+        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }) } } }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts
index ce662c57531..5e35ea1da22 100644
--- a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
 import { map } from 'rxjs/operators';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { ActivatedRoute } from '@angular/router';
 import { AlertType } from '../../../shared/alert/aletr-type';
 
@@ -30,6 +30,6 @@ export class ItemVersionHistoryComponent {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.parent.data.pipe(map((data) => data.item)).pipe(getSucceededRemoteData()) as Observable<RemoteData<Item>>;
+    this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso)).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Item>>;
   }
 }
diff --git a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts b/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
index 249298c0920..4931fbdbd70 100644
--- a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
@@ -15,8 +14,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ItemWithdrawComponent } from './item-withdraw.component';
 import { By } from '@angular/platform-browser';
-import { RestResponse } from '../../../core/cache/response.models';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 let comp: ItemWithdrawComponent;
 let fixture: ComponentFixture<ItemWithdrawComponent>;
@@ -27,8 +25,6 @@ let routerStub;
 let mockItemDataService: ItemDataService;
 let routeStub;
 let notificationsServiceStub;
-let successfulRestResponse;
-let failRestResponse;
 
 describe('ItemWithdrawComponent', () => {
   beforeEach(async(() => {
@@ -46,14 +42,12 @@ describe('ItemWithdrawComponent', () => {
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setWithDrawn: observableOf(new RestResponse(true, 200, 'OK'))
+      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem)
     });
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
-          id: 'fake-id'
-        })
+        dso: createSuccessfulRemoteDataObject(mockItem)
       })
     };
 
@@ -74,9 +68,6 @@ describe('ItemWithdrawComponent', () => {
   }));
 
   beforeEach(() => {
-    successfulRestResponse = new RestResponse(true, 200, 'OK');
-    failRestResponse = new RestResponse(false, 500, 'Internal Server Error');
-
     fixture = TestBed.createComponent(ItemWithdrawComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
@@ -98,9 +89,8 @@ describe('ItemWithdrawComponent', () => {
       spyOn(comp, 'processRestResponse');
       comp.performAction();
 
-      expect(mockItemDataService.setWithDrawn).toHaveBeenCalledWith(mockItem.id, true);
+      expect(mockItemDataService.setWithDrawn).toHaveBeenCalledWith(mockItem, true);
       expect(comp.processRestResponse).toHaveBeenCalled();
     });
   });
-})
-;
+});
diff --git a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts b/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
index 1fed1756a4a..13843b6d1db 100644
--- a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
+++ b/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
@@ -1,9 +1,8 @@
 import { Component } from '@angular/core';
-import { first } from 'rxjs/operators';
 import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { RestResponse } from '../../../core/cache/response.models';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-item-withdraw',
@@ -21,8 +20,8 @@ export class ItemWithdrawComponent extends AbstractSimpleItemActionComponent {
    * Perform the withdraw action to the item
    */
   performAction() {
-    this.itemDataService.setWithDrawn(this.item.id, true).pipe(first()).subscribe(
-      (response: RestResponse) => {
+    this.itemDataService.setWithDrawn(this.item, true).pipe(getFirstCompletedRemoteData()).subscribe(
+      (response: RemoteData<Item>) => {
         this.processRestResponse(response);
       }
     );
diff --git a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
index a6e64250cb3..f9bc44acec4 100644
--- a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
@@ -15,12 +15,12 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { AbstractSimpleItemActionComponent } from './abstract-simple-item-action.component';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { getItemEditPath } from '../../item-page-routing.module';
-import { RestResponse } from '../../../core/cache/response.models';
 import {
+  createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
 } from '../../../shared/remote-data.utils';
+import { getItemEditRoute } from '../../item-page-routing-paths';
 
 /**
  * Test component that implements the AbstractSimpleItemActionComponent used to test the
@@ -50,8 +50,8 @@ let routerStub;
 let mockItemDataService;
 let routeStub;
 let notificationsServiceStub;
-let successfulRestResponse;
-let failRestResponse;
+let successfulRemoteData;
+let failedRemoteData;
 
 describe('AbstractSimpleItemActionComponent', () => {
   beforeEach(async(() => {
@@ -74,7 +74,7 @@ describe('AbstractSimpleItemActionComponent', () => {
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
+        dso: createSuccessfulRemoteDataObject({
           id: 'fake-id'
         })
       })
@@ -97,8 +97,8 @@ describe('AbstractSimpleItemActionComponent', () => {
   }));
 
   beforeEach(() => {
-    successfulRestResponse = new RestResponse(true, 200, 'OK');
-    failRestResponse = new RestResponse(false, 500, 'Internal Server Error');
+    successfulRemoteData = createSuccessfulRemoteDataObject({ });
+    failedRemoteData = createFailedRemoteDataObject('Internal Server Error', 500);
 
     fixture = TestBed.createComponent(MySimpleItemActionComponent);
     comp = fixture.componentInstance;
@@ -132,18 +132,18 @@ describe('AbstractSimpleItemActionComponent', () => {
     expect(comp.performAction).toHaveBeenCalled();
   });
 
-  it('should process a RestResponse to navigate and display success notification', () => {
-    comp.processRestResponse(successfulRestResponse);
+  it('should process a RemoteData to navigate and display success notification', () => {
+    comp.processRestResponse(successfulRemoteData);
 
     expect(notificationsServiceStub.success).toHaveBeenCalled();
-    expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditPath(mockItem.id)]);
+    expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditRoute(mockItem.id)]);
   });
 
-  it('should process a RestResponse to navigate and display success notification', () => {
-    comp.processRestResponse(failRestResponse);
+  it('should process a RemoteData to navigate and display success notification', () => {
+    comp.processRestResponse(failedRemoteData);
 
     expect(notificationsServiceStub.error).toHaveBeenCalled();
-    expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditPath(mockItem.id)]);
+    expect(routerStub.navigate).toHaveBeenCalledWith([getItemEditRoute(mockItem.id)]);
   });
 
 });
diff --git a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
index 7773dbb5738..45818631078 100644
--- a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
+++ b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
@@ -1,16 +1,15 @@
-import {Component, OnInit, Predicate} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
-import {NotificationsService} from '../../../shared/notifications/notifications.service';
-import {ItemDataService} from '../../../core/data/item-data.service';
-import {TranslateService} from '@ngx-translate/core';
-import {Item} from '../../../core/shared/item.model';
-import {RemoteData} from '../../../core/data/remote-data';
-import {Observable} from 'rxjs';
-import {getSucceededRemoteData} from '../../../core/shared/operators';
-import {first, map} from 'rxjs/operators';
-import {findSuccessfulAccordingTo} from '../edit-item-operators';
-import {getItemEditPath} from '../../item-page-routing.module';
-import { RestResponse } from '../../../core/cache/response.models';
+import { Component, OnInit, Predicate } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Item } from '../../../core/shared/item.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Observable } from 'rxjs';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { first, map } from 'rxjs/operators';
+import { findSuccessfulAccordingTo } from '../edit-item-operators';
+import { getItemEditRoute } from '../../item-page-routing-paths';
 
 /**
  * Component to render and handle simple item edit actions such as withdrawal and reinstatement.
@@ -42,8 +41,8 @@ export class AbstractSimpleItemActionComponent implements OnInit {
 
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
-      map((data) => data.item),
-      getSucceededRemoteData()
+      map((data) => data.dso),
+      getFirstSucceededRemoteData()
     )as Observable<RemoteData<Item>>;
 
     this.itemRD$.pipe(first()).subscribe((rd) => {
@@ -56,7 +55,6 @@ export class AbstractSimpleItemActionComponent implements OnInit {
     this.headerMessage = 'item.edit.' + this.messageKey + '.header';
     this.descriptionMessage = 'item.edit.' + this.messageKey + '.description';
   }
-
   /**
    * Perform the operation linked to this action
    */
@@ -68,16 +66,16 @@ export class AbstractSimpleItemActionComponent implements OnInit {
    * Process the response obtained during the performAction method and navigate back to the edit page
    * @param response from the action in the performAction method
    */
-  processRestResponse(response: RestResponse) {
-    if (response.isSuccessful) {
+  processRestResponse(response: RemoteData<any>) {
+    if (response.hasSucceeded) {
       this.itemDataService.findById(this.item.id).pipe(
         findSuccessfulAccordingTo(this.predicate)).subscribe(() => {
         this.notificationsService.success(this.translateService.get('item.edit.' + this.messageKey + '.success'));
-        this.router.navigate([getItemEditPath(this.item.id)]);
+        this.router.navigate([getItemEditRoute(this.item.id)]);
       });
     } else {
       this.notificationsService.error(this.translateService.get('item.edit.' + this.messageKey + '.error'));
-      this.router.navigate([getItemEditPath(this.item.id)]);
+      this.router.navigate([getItemEditRoute(this.item.id)]);
     }
   }
 
diff --git a/src/app/+item-page/field-components/collections/collections.component.spec.ts b/src/app/+item-page/field-components/collections/collections.component.spec.ts
index 8e5ca6dd3ce..1ff9e497e83 100644
--- a/src/app/+item-page/field-components/collections/collections.component.spec.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.spec.ts
@@ -7,7 +7,10 @@ import { CollectionDataService } from '../../../core/data/collection-data.servic
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
 import { CollectionsComponent } from './collections.component';
 
 let collectionsComponent: CollectionsComponent;
@@ -23,11 +26,14 @@ const mockCollection1: Collection = Object.assign(new Collection(), {
         value: 'Short description'
       }
     ]
+  },
+  _links: {
+    self: { href: 'collection-selflink' }
   }
 });
 
 const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: createSuccessfulRemoteDataObject$(mockCollection1)});
-const failedMockItem: Item = Object.assign(new Item(), {owningCollection: createFailedRemoteDataObject$(mockCollection1)});
+const failedMockItem: Item = Object.assign(new Item(), {owningCollection: createFailedRemoteDataObject$('error', 500)});
 
 describe('CollectionsComponent', () => {
   collectionDataServiceStub = {
@@ -35,7 +41,7 @@ describe('CollectionsComponent', () => {
       if (item === succeededMockItem) {
         return createSuccessfulRemoteDataObject$(mockCollection1);
       } else {
-        return createFailedRemoteDataObject$(mockCollection1);
+        return createFailedRemoteDataObject$('error', 500);
       }
     }
   };
diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/+item-page/field-components/collections/collections.component.ts
index 0d50fcad83a..32dc8dfb739 100644
--- a/src/app/+item-page/field-components/collections/collections.component.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.ts
@@ -2,12 +2,13 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component renders the parent collections section of the item
@@ -40,18 +41,23 @@ export class CollectionsComponent implements OnInit {
     // only the owning collection
     this.collectionsRD$ = this.cds.findOwningCollectionFor(this.item).pipe(
       map((rd: RemoteData<Collection>) => {
-        if (rd.hasSucceeded) {
+        if (hasValue(rd.payload)) {
           return new RemoteData(
-            false,
-            false,
-            true,
-            undefined,
-            new PaginatedList({
+            rd.timeCompleted,
+            rd.msToLive,
+            rd.lastUpdated,
+            rd.state,
+            rd.errorMessage,
+            buildPaginatedList({
               elementsPerPage: 10,
               totalPages: 1,
               currentPage: 1,
-              totalElements: 1
-            } as PageInfo, [rd.payload])
+              totalElements: 1,
+              _links: {
+                self: rd.payload._links.self
+              }
+            } as PageInfo, [rd.payload]),
+            rd.statusCode
           );
         } else {
           return rd as any;
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
index b8ab9bdb414..00218b66d10 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
@@ -1,29 +1,87 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <div class="file-section row" *ngFor="let file of (bitstreams$ | async); let last=last;">
-        <div class="col-3">
-            <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
-        </div>
-        <div class="col-7">
-            <dl class="row">
-                <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                <dd class="col-md-8">{{file.name}}</dd>
+    <div *ngVar="(originals$ | async)?.payload as originals">
+        <div *ngIf="hasValuesInBundle(originals)">
+            <h5 class="simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h5>
+            <ds-pagination *ngIf="originals?.page?.length > 0"
+                           [hideGear]="true"
+                           [hidePagerWhenSinglePage]="true"
+                           [paginationOptions]="originalOptions"
+                           [pageInfoState]="originals"
+                           [collectionSize]="originals?.totalElements"
+                           [disableRouteParameterUpdate]="true"
+                           (pageChange)="switchOriginalPage($event)">
+
+
+                <div class="file-section row" *ngFor="let file of originals?.page;">
+                    <div class="col-3">
+                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
+                    </div>
+                    <div class="col-7">
+                        <dl class="row">
+                            <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
+                            <dd class="col-md-8">{{file.name}}</dd>
 
-                <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
-                <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
+                            <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
+                            <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
 
 
-                <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
-                <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
+                            <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
+                            <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
 
 
-                <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
-                <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
-            </dl>
+                            <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
+                            <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
+                        </dl>
+                    </div>
+                    <div class="col-2">
+                        <ds-file-download-link [href]="file._links.content.href" [download]="file.name">
+                            {{"item.page.filesection.download" | translate}}
+                        </ds-file-download-link>
+                    </div>
+                </div>
+            </ds-pagination>
         </div>
-        <div class="col-2">
-            <a [href]="file._links.content.href" [download]="file.name">
-                {{"item.page.filesection.download" | translate}}
-            </a>
+    </div>
+    <div *ngVar="(licenses$ | async)?.payload as licenses">
+        <div *ngIf="hasValuesInBundle(licenses)">
+            <h5 class="simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h5>
+            <ds-pagination *ngIf="licenses?.page?.length > 0"
+                           [hideGear]="true"
+                           [hidePagerWhenSinglePage]="true"
+                           [paginationOptions]="licenseOptions"
+                           [pageInfoState]="licenses"
+                           [collectionSize]="licenses?.totalElements"
+                           [disableRouteParameterUpdate]="true"
+                           (pageChange)="switchLicensePage($event)">
+
+
+                <div class="file-section row" *ngFor="let file of licenses?.page;">
+                    <div class="col-3">
+                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
+                    </div>
+                    <div class="col-7">
+                        <dl class="row">
+                            <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
+                            <dd class="col-md-8">{{file.name}}</dd>
+
+                            <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
+                            <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
+
+                            <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
+                            <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
+
+
+                            <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
+                            <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
+                        </dl>
+                    </div>
+                    <div class="col-2">
+                        <ds-file-download-link [href]="file._links.content.href" [download]="file.name">
+                            {{"item.page.filesection.download" | translate}}
+                        </ds-file-download-link>
+                    </div>
+                </div>
+            </ds-pagination>
         </div>
     </div>
 </ds-metadata-field-wrapper>
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/+item-page/full/field-components/file-section/full-file-section.component.spec.ts
new file mode 100644
index 00000000000..4d4b713648c
--- /dev/null
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.spec.ts
@@ -0,0 +1,120 @@
+import {FullFileSectionComponent} from './full-file-section.component';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {createSuccessfulRemoteDataObject$} from '../../../../shared/remote-data.utils';
+import {createPaginatedList} from '../../../../shared/testing/utils.test';
+import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
+import {TranslateLoaderMock} from '../../../../shared/mocks/translate-loader.mock';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {VarDirective} from '../../../../shared/utils/var.directive';
+import {FileSizePipe} from '../../../../shared/utils/file-size-pipe';
+import {MetadataFieldWrapperComponent} from '../../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
+import {BitstreamDataService} from '../../../../core/data/bitstream-data.service';
+import {NO_ERRORS_SCHEMA} from '@angular/core';
+import {Bitstream} from '../../../../core/shared/bitstream.model';
+import {of as observableOf} from 'rxjs';
+import {MockBitstreamFormat1} from '../../../../shared/mocks/item.mock';
+import {By} from '@angular/platform-browser';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+
+describe('FullFileSectionComponent', () => {
+    let comp: FullFileSectionComponent;
+    let fixture: ComponentFixture<FullFileSectionComponent>;
+
+    const mockBitstream: Bitstream = Object.assign(new Bitstream(),
+        {
+            sizeBytes: 10201,
+            content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
+            format: observableOf(MockBitstreamFormat1),
+            bundleName: 'ORIGINAL',
+            _links: {
+                self: {
+                    href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
+                },
+                content: {
+                    href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content'
+                }
+            },
+            id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
+            uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
+            type: 'bitstream',
+            metadata: {
+                'dc.title': [
+                    {
+                        language: null,
+                        value: 'test_word.docx'
+                    }
+                ]
+            }
+        });
+
+    const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
+        findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream, mockBitstream, mockBitstream]))
+    });
+
+    beforeEach(async(() => {
+
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot({
+                loader: {
+                    provide: TranslateLoader,
+                    useClass: TranslateLoaderMock
+                }
+            }), BrowserAnimationsModule],
+            declarations: [FullFileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
+            providers: [
+                {provide: BitstreamDataService, useValue: bitstreamDataService},
+                {provide: NotificationsService, useValue: new NotificationsServiceStub()}
+            ],
+
+            schemas: [NO_ERRORS_SCHEMA]
+        }).compileComponents();
+    }));
+
+    beforeEach(async(() => {
+        fixture = TestBed.createComponent(FullFileSectionComponent);
+        comp = fixture.componentInstance;
+        fixture.detectChanges();
+    }));
+
+    describe('when the full file section gets loaded with bitstreams available', () => {
+        it ('should contain a list with bitstreams', () => {
+            const fileSection = fixture.debugElement.queryAll(By.css('.file-section'));
+            expect(fileSection.length).toEqual(6);
+        });
+
+        describe('when we press the pageChange button for original bundle', () => {
+            beforeEach(() => {
+                comp.switchOriginalPage(2);
+                fixture.detectChanges();
+            });
+
+            it ('should give the value to the currentpage', () => {
+                expect(comp.originalOptions.currentPage).toBe(2);
+            })
+            it ('should call the next function on the originalCurrentPage', (done) => {
+                comp.originalCurrentPage$.subscribe((event) => {
+                    expect(event).toEqual(2);
+                    done();
+                })
+            })
+        })
+
+        describe('when we press the pageChange button for license bundle', () => {
+            beforeEach(() => {
+                comp.switchLicensePage(2);
+                fixture.detectChanges();
+            });
+
+            it ('should give the value to the currentpage', () => {
+                expect(comp.licenseOptions.currentPage).toBe(2);
+            })
+            it ('should call the next function on the licenseCurrentPage', (done) => {
+                comp.licenseCurrentPage$.subscribe((event) => {
+                    expect(event).toEqual(2);
+                    done();
+                })
+            })
+        })
+    })
+})
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
index f18fccd7e9e..67c0ca8fa90 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,13 +1,19 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
+import { Component, Input, OnInit } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import { FileSectionComponent } from '../../../simple/field-components/file-section/file-section.component';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { switchMap } from 'rxjs/operators';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { hasValue, isEmpty } from '../../../../shared/empty.util';
+import { tap } from 'rxjs/internal/operators/tap';
 
 /**
  * This component renders the file section of the item
@@ -25,49 +31,90 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
 
   label: string;
 
-  bitstreams$: Observable<Bitstream[]>;
+  originals$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+  licenses$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  pageSize = 5;
+  originalOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'original-bitstreams-options',
+    currentPage: 1,
+    pageSize: this.pageSize
+  });
+  originalCurrentPage$ = new BehaviorSubject<number>(1);
+
+  licenseOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'license-bitstreams-options',
+    currentPage: 1,
+    pageSize: this.pageSize
+  });
+  licenseCurrentPage$ = new BehaviorSubject<number>(1);
 
   constructor(
-    bitstreamDataService: BitstreamDataService
+    bitstreamDataService: BitstreamDataService,
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService
   ) {
-    super(bitstreamDataService);
+    super(bitstreamDataService, notificationsService, translateService);
   }
 
   ngOnInit(): void {
-    super.ngOnInit();
+    this.initialize();
   }
 
   initialize(): void {
-    // TODO pagination
-    const originals$ = this.bitstreamDataService.findAllByItemAndBundleName(
-      this.item,
-      'ORIGINAL',
-      { elementsPerPage: Number.MAX_SAFE_INTEGER },
-      followLink( 'format')
-    ).pipe(
-      getFirstSucceededRemoteListPayload(),
-      startWith([])
-    );
-    const licenses$ = this.bitstreamDataService.findAllByItemAndBundleName(
-      this.item,
-      'LICENSE',
-      { elementsPerPage: Number.MAX_SAFE_INTEGER },
-      followLink( 'format')
-    ).pipe(
-      getFirstSucceededRemoteListPayload(),
-      startWith([])
+    this.originals$ = this.originalCurrentPage$.pipe(
+      switchMap((pageNumber: number) => this.bitstreamDataService.findAllByItemAndBundleName(
+        this.item,
+        'ORIGINAL',
+        {elementsPerPage: this.pageSize, currentPage: pageNumber},
+        true,
+        followLink('format')
+      )),
+      tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
+          if (hasValue(rd.errorMessage)) {
+            this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
+          }
+        }
+      )
     );
-    this.bitstreams$ = observableCombineLatest(originals$, licenses$).pipe(
-      map(([o, l]) => [...o, ...l]),
-      map((files: Bitstream[]) =>
-        files.map(
-          (original) => {
-            original.thumbnail = this.bitstreamDataService.getMatchingThumbnail(this.item, original);
-            return original;
+
+    this.licenses$ = this.licenseCurrentPage$.pipe(
+      switchMap((pageNumber: number) => this.bitstreamDataService.findAllByItemAndBundleName(
+        this.item,
+        'LICENSE',
+        {elementsPerPage: this.pageSize, currentPage: pageNumber},
+        true,
+        followLink('format')
+      )),
+      tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
+          if (hasValue(rd.errorMessage)) {
+            this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
           }
-        )
+        }
       )
     );
+
+  }
+
+  /**
+   * Update the current page for the original bundle bitstreams
+   * @param page
+   */
+  switchOriginalPage(page: number) {
+    this.originalOptions.currentPage = page;
+    this.originalCurrentPage$.next(page);
   }
 
+  /**
+   * Update the current page for the license bundle bitstreams
+   * @param page
+   */
+  switchLicensePage(page: number) {
+    this.licenseOptions.currentPage = page;
+    this.licenseCurrentPage$.next(page);
+  }
+
+  hasValuesInBundle(bundle: PaginatedList<Bitstream>) {
+    return hasValue(bundle) && !isEmpty(bundle.page);
+  }
 }
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 29d3582492d..762390c7d44 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,9 +1,15 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
   <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="itemRD?.payload as item">
+      <ds-item-alerts [item]="item"></ds-item-alerts>
       <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
       <ds-view-tracker [object]="item"></ds-view-tracker>
-      <ds-item-page-title-field [item]="item"></ds-item-page-title-field>
+      <div class="d-flex flex-row">
+        <ds-item-page-title-field class="mr-auto" [item]="item"></ds-item-page-title-field>
+        <div class="pl-2">
+          <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="item" [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
+        </div>
+      </div>
       <div class="simple-view-link my-3">
         <a class="btn btn-outline-primary" [routerLink]="['/items/' + item.id]">
           {{"item.page.link.simple" | translate}}
diff --git a/src/app/+item-page/full/full-item-page.component.spec.ts b/src/app/+item-page/full/full-item-page.component.spec.ts
index 0512ea2fef0..24123ebca33 100644
--- a/src/app/+item-page/full/full-item-page.component.spec.ts
+++ b/src/app/+item-page/full/full-item-page.component.spec.ts
@@ -11,9 +11,6 @@ import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Item } from '../../core/shared/item.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { RemoteData } from '../../core/data/remote-data';
 import { of as observableOf } from 'rxjs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
@@ -21,9 +18,11 @@ import {
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
+import { AuthService } from '../../core/auth/auth.service';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: {
       'dc.title': [
         {
@@ -34,7 +33,7 @@ const mockItem: Item = Object.assign(new Item(), {
     }
 });
 const routeStub = Object.assign(new ActivatedRouteStub(), {
-  data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
+  data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
 });
 const metadataServiceStub = {
   /* tslint:disable:no-empty */
@@ -46,7 +45,14 @@ describe('FullItemPageComponent', () => {
   let comp: FullItemPageComponent;
   let fixture: ComponentFixture<FullItemPageComponent>;
 
+  let authService: AuthService;
+
   beforeEach(async(() => {
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      setRedirectUrl: {}
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
         loader: {
@@ -58,7 +64,8 @@ describe('FullItemPageComponent', () => {
       providers: [
         {provide: ActivatedRoute, useValue: routeStub},
         {provide: ItemDataService, useValue: {}},
-        {provide: MetadataService, useValue: metadataServiceStub}
+        {provide: MetadataService, useValue: metadataServiceStub},
+        { provide: AuthService, useValue: authService },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index b2a42b7c6fe..741f1e76a7b 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -15,6 +15,7 @@ import { MetadataService } from '../../core/metadata/metadata.service';
 
 import { fadeInOut } from '../../shared/animations/fade';
 import { hasValue } from '../../shared/empty.util';
+import { AuthService } from '../../core/auth/auth.service';
 
 /**
  * This component renders a simple item page.
@@ -35,8 +36,8 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit {
 
   metadata$: Observable<MetadataMap>;
 
-  constructor(route: ActivatedRoute, router: Router, items: ItemDataService, metadataService: MetadataService) {
-    super(route, router, items, metadataService);
+  constructor(route: ActivatedRoute, router: Router, items: ItemDataService, metadataService: MetadataService, authService: AuthService) {
+    super(route, router, items, metadataService, authService);
   }
 
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/
diff --git a/src/app/+item-page/item-page-administrator.guard.ts b/src/app/+item-page/item-page-administrator.guard.ts
new file mode 100644
index 00000000000..692300a8711
--- /dev/null
+++ b/src/app/+item-page/item-page-administrator.guard.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { ItemPageResolver } from './item-page.resolver';
+import { Item } from '../core/shared/item.model';
+import { DsoPageFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard';
+import { Observable } from 'rxjs/internal/Observable';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
+ */
+export class ItemPageAdministratorGuard extends DsoPageFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/+item-page/item-page-routing-paths.ts b/src/app/+item-page/item-page-routing-paths.ts
new file mode 100644
index 00000000000..bb8f052eda4
--- /dev/null
+++ b/src/app/+item-page/item-page-routing-paths.ts
@@ -0,0 +1,18 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+
+export const ITEM_MODULE_PATH = 'items';
+
+export function getItemModuleRoute() {
+  return `/${ITEM_MODULE_PATH}`;
+}
+
+export function getItemPageRoute(itemId: string) {
+  return new URLCombiner(getItemModuleRoute(), itemId).toString();
+}
+
+export function getItemEditRoute(id: string) {
+  return new URLCombiner(getItemModuleRoute(), id, ITEM_EDIT_PATH).toString()
+}
+
+export const ITEM_EDIT_PATH = 'edit';
+export const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/+item-page/item-page-routing.module.ts
index 52faf96236f..022d905ff32 100644
--- a/src/app/+item-page/item-page-routing.module.ts
+++ b/src/app/+item-page/item-page-routing.module.ts
@@ -4,24 +4,15 @@ import { RouterModule } from '@angular/router';
 import { ItemPageComponent } from './simple/item-page.component';
 import { FullItemPageComponent } from './full/full-item-page.component';
 import { ItemPageResolver } from './item-page.resolver';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getItemModulePath } from '../app-routing.module';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { ItemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
 import { LinkService } from '../core/cache/builders/link.service';
 import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
-
-export function getItemPageRoute(itemId: string) {
-  return new URLCombiner(getItemModulePath(), itemId).toString();
-}
-
-export function getItemEditPath(id: string) {
-  return new URLCombiner(getItemModulePath(), id, ITEM_EDIT_PATH).toString()
-}
-
-const ITEM_EDIT_PATH = 'edit';
-const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
+import { UPLOAD_BITSTREAM_PATH, ITEM_EDIT_PATH } from './item-page-routing-paths';
+import { ItemPageAdministratorGuard } from './item-page-administrator.guard';
+import { MenuItemType } from '../shared/menu/initial-menus-state';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 
 @NgModule({
   imports: [
@@ -29,7 +20,7 @@ const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
       {
         path: ':id',
         resolve: {
-          item: ItemPageResolver,
+          dso: ItemPageResolver,
           breadcrumb: ItemBreadcrumbResolver
         },
         runGuardsAndResolvers: 'always',
@@ -46,7 +37,7 @@ const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
           {
             path: ITEM_EDIT_PATH,
             loadChildren: './edit-item-page/edit-item-page.module#EditItemPageModule',
-            canActivate: [AuthenticatedGuard]
+            canActivate: [ItemPageAdministratorGuard]
           },
           {
             path: UPLOAD_BITSTREAM_PATH,
@@ -54,6 +45,20 @@ const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
             canActivate: [AuthenticatedGuard]
           }
         ],
+        data: {
+          menu: {
+            public: [{
+              id: 'statistics_item_:id',
+              active: true,
+              visible: true,
+              model: {
+                type: MenuItemType.LINK,
+                text: 'menu.section.statistics',
+                link: 'statistics/items/:id/',
+              } as LinkMenuItemModel,
+            }],
+          },
+        },
       }
     ])
   ],
@@ -61,7 +66,8 @@ const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
     ItemPageResolver,
     ItemBreadcrumbResolver,
     DSOBreadcrumbsService,
-    LinkService
+    LinkService,
+    ItemPageAdministratorGuard
   ]
 
 })
diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts
index 4c3a64e1178..29ee9ecc590 100644
--- a/src/app/+item-page/item-page.module.ts
+++ b/src/app/+item-page/item-page.module.ts
@@ -30,6 +30,7 @@ import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.c
 import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
 import { StatisticsModule } from '../statistics/statistics.module';
 import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
+import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
 
 @NgModule({
   imports: [
@@ -54,6 +55,7 @@ import { AbstractIncrementalListComponent } from './simple/abstract-incremental-
     CollectionsComponent,
     FullFileSectionComponent,
     PublicationComponent,
+    UntypedItemComponent,
     RelatedItemsComponent,
     ItemComponent,
     GenericItemPageFieldComponent,
@@ -75,7 +77,8 @@ import { AbstractIncrementalListComponent } from './simple/abstract-incremental-
     TabbedRelatedEntitiesSearchComponent
   ],
   entryComponents: [
-    PublicationComponent
+    PublicationComponent,
+    UntypedItemComponent
   ]
 })
 export class ItemPageModule {
diff --git a/src/app/+item-page/item-page.resolver.ts b/src/app/+item-page/item-page.resolver.ts
index 501bb34d2c3..1b5eb051284 100644
--- a/src/app/+item-page/item-page.resolver.ts
+++ b/src/app/+item-page/item-page.resolver.ts
@@ -4,9 +4,9 @@ import { Observable } from 'rxjs';
 import { RemoteData } from '../core/data/remote-data';
 import { ItemDataService } from '../core/data/item-data.service';
 import { Item } from '../core/shared/item.model';
-import { hasValue } from '../shared/empty.util';
-import { find } from 'rxjs/operators';
 import { followLink } from '../shared/utils/follow-link-config.model';
+import { FindListOptions } from '../core/data/request.models';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -25,12 +25,13 @@ export class ItemPageResolver implements Resolve<RemoteData<Item>> {
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
     return this.itemService.findById(route.params.id,
+      false,
       followLink('owningCollection'),
-      followLink('bundles'),
+      followLink('bundles', new FindListOptions(), true, followLink('bitstreams')),
       followLink('relationships'),
       followLink('version', undefined, true, followLink('versionhistory')),
     ).pipe(
-      find((RD) => hasValue(RD.error) || RD.hasSucceeded),
+      getFirstCompletedRemoteData(),
     );
   }
 }
diff --git a/src/app/+item-page/simple/field-components/file-section/file-section.component.html b/src/app/+item-page/simple/field-components/file-section/file-section.component.html
index 6533322e036..1fdee6dc4d7 100644
--- a/src/app/+item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/+item-page/simple/field-components/file-section/file-section.component.html
@@ -1,11 +1,18 @@
 <ng-container *ngVar="(bitstreams$ | async) as bitstreams">
   <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
     <div class="file-section">
-      <a *ngFor="let file of bitstreams; let last=last;" [href]="file?._links.content.href" [download]="file?.name">
+      <ds-file-download-link *ngFor="let file of bitstreams; let last=last;" [href]="file?._links.content.href" [download]="file?.name">
         <span>{{file?.name}}</span>
         <span>({{(file?.sizeBytes) | dsFileSize }})</span>
         <span *ngIf="!last" innerHTML="{{separator}}"></span>
-      </a>
+      </ds-file-download-link>
+      <ds-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
+      <div *ngIf="!isLastPage" class="mt-1" id="view-more">
+        <a class="bitstream-view-more btn btn-outline-secondary btn-sm" [routerLink]="" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</a>
+      </div>
+      <div *ngIf="isLastPage && currentPage != 1" class="mt-1" id="collapse">
+        <a class="bitstream-collapse btn btn-outline-secondary btn-sm" [routerLink]="" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</a>
+      </div>
     </div>
   </ds-metadata-field-wrapper>
 </ng-container>
diff --git a/src/app/+item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/+item-page/simple/field-components/file-section/file-section.component.spec.ts
new file mode 100644
index 00000000000..330aaadfe02
--- /dev/null
+++ b/src/app/+item-page/simple/field-components/file-section/file-section.component.spec.ts
@@ -0,0 +1,172 @@
+import {FileSectionComponent} from './file-section.component';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
+import {TranslateLoaderMock} from '../../../../shared/mocks/translate-loader.mock';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {VarDirective} from '../../../../shared/utils/var.directive';
+import {NO_ERRORS_SCHEMA} from '@angular/core';
+import {BitstreamDataService} from '../../../../core/data/bitstream-data.service';
+import {createSuccessfulRemoteDataObject$} from '../../../../shared/remote-data.utils';
+import {By} from '@angular/platform-browser';
+import {Bitstream} from '../../../../core/shared/bitstream.model';
+import {of as observableOf} from 'rxjs';
+import {MockBitstreamFormat1} from '../../../../shared/mocks/item.mock';
+import {FileSizePipe} from '../../../../shared/utils/file-size-pipe';
+import {PageInfo} from '../../../../core/shared/page-info.model';
+import {MetadataFieldWrapperComponent} from '../../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
+import {createPaginatedList} from '../../../../shared/testing/utils.test';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+
+describe('FileSectionComponent', () => {
+    let comp: FileSectionComponent;
+    let fixture: ComponentFixture<FileSectionComponent>;
+
+    const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
+        findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    });
+
+    const mockBitstream: Bitstream = Object.assign(new Bitstream(),
+        {
+            sizeBytes: 10201,
+            content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
+            format: observableOf(MockBitstreamFormat1),
+            bundleName: 'ORIGINAL',
+            _links: {
+                self: {
+                    href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
+                },
+                content: {
+                    href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content'
+                }
+            },
+            id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
+            uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
+            type: 'bitstream',
+            metadata: {
+                'dc.title': [
+                    {
+                        language: null,
+                        value: 'test_word.docx'
+                    }
+                ]
+            }
+        });
+
+    beforeEach(async(() => {
+
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot({
+                loader: {
+                    provide: TranslateLoader,
+                    useClass: TranslateLoaderMock
+                }
+            }), BrowserAnimationsModule],
+            declarations: [FileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
+            providers: [
+                {provide: BitstreamDataService, useValue: bitstreamDataService},
+                {provide: NotificationsService, useValue: new NotificationsServiceStub()}
+            ],
+
+            schemas: [NO_ERRORS_SCHEMA]
+        }).compileComponents();
+    }));
+
+    beforeEach(async(() => {
+        fixture = TestBed.createComponent(FileSectionComponent);
+        comp = fixture.componentInstance;
+        fixture.detectChanges();
+    }));
+
+    describe('when the bitstreams are loading', () => {
+        beforeEach(() => {
+            comp.bitstreams$.next([mockBitstream]);
+            comp.isLoading = true;
+            fixture.detectChanges();
+        });
+
+        it('should display a loading component', () => {
+            const loading = fixture.debugElement.query(By.css('ds-loading'));
+            expect(loading.nativeElement).toBeDefined();
+        });
+    });
+
+    describe('when the "Show more" button is clicked', () => {
+
+        beforeEach(() => {
+            comp.bitstreams$.next([mockBitstream]);
+            comp.currentPage = 1;
+            comp.isLastPage = false;
+            fixture.detectChanges();
+        });
+
+        it('should call the service to retrieve more bitstreams', () => {
+            const viewMore = fixture.debugElement.query(By.css('.bitstream-view-more'));
+            viewMore.triggerEventHandler('click', null);
+            expect(bitstreamDataService.findAllByItemAndBundleName).toHaveBeenCalled()
+        })
+
+        it('one bitstream should be on the page', () => {
+            const viewMore = fixture.debugElement.query(By.css('.bitstream-view-more'));
+            viewMore.triggerEventHandler('click', null);
+            const fileDownloadLink = fixture.debugElement.queryAll(By.css('ds-file-download-link'));
+            expect(fileDownloadLink.length).toEqual(1);
+        })
+
+        describe('when it is then clicked again', () => {
+            beforeEach(() => {
+                bitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream])));
+                const viewMore = fixture.debugElement.query(By.css('.bitstream-view-more'));
+                viewMore.triggerEventHandler('click', null);
+                fixture.detectChanges();
+
+            })
+            it('should contain another bitstream', () => {
+                const fileDownloadLink = fixture.debugElement.queryAll(By.css('ds-file-download-link'));
+                expect(fileDownloadLink.length).toEqual(2);
+            })
+        })
+    });
+
+    describe('when its the last page of bitstreams', () => {
+        beforeEach(() => {
+            comp.bitstreams$.next([mockBitstream]);
+            comp.isLastPage = true;
+            comp.currentPage = 2;
+            fixture.detectChanges();
+        });
+
+        it('should not contain a view more link', () => {
+            const viewMore = fixture.debugElement.query(By.css('.bitstream-view-more'));
+            expect(viewMore).toBeNull();
+        })
+
+        it('should contain a view less link', () => {
+            const viewLess = fixture.debugElement.query(By.css('.bitstream-collapse'));
+            expect(viewLess).toBeDefined();
+        })
+
+        it('clicking on the view less link should reset the pages and call getNextPage()', () => {
+            const pageInfo = Object.assign(new PageInfo(), {
+                elementsPerPage: 3,
+                totalElements: 5,
+                totalPages: 2,
+                currentPage: 1,
+                _links: {
+                    self: {href: 'https://rest.api/core/bitstreams/'},
+                    next: {href: 'https://rest.api/core/bitstreams?page=2'}
+                }
+            });
+            const PaginatedList = Object.assign(createPaginatedList([mockBitstream]), {
+                pageInfo: pageInfo
+            });
+            bitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(PaginatedList));
+            const viewLess = fixture.debugElement.query(By.css('.bitstream-collapse'));
+            viewLess.triggerEventHandler('click', null);
+            expect(bitstreamDataService.findAllByItemAndBundleName).toHaveBeenCalled();
+            expect(comp.currentPage).toBe(1);
+            expect(comp.isLastPage).toBeFalse();
+        })
+
+    })
+})
diff --git a/src/app/+item-page/simple/field-components/file-section/file-section.component.ts b/src/app/+item-page/simple/field-components/file-section/file-section.component.ts
index 2e09c1cd497..d28b5799963 100644
--- a/src/app/+item-page/simple/field-components/file-section/file-section.component.ts
+++ b/src/app/+item-page/simple/field-components/file-section/file-section.component.ts
@@ -1,10 +1,15 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { hasValue } from '../../../../shared/empty.util';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 /**
  * This component renders the file section of the item
@@ -22,21 +27,55 @@ export class FileSectionComponent implements OnInit {
 
   separator = '<br/>';
 
-  bitstreams$: Observable<Bitstream[]>;
+  bitstreams$: BehaviorSubject<Bitstream[]>;
+
+  currentPage: number;
+
+  isLoading: boolean;
+
+  isLastPage: boolean;
+
+  pageSize = 5;
 
   constructor(
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService
   ) {
   }
 
   ngOnInit(): void {
-    this.initialize();
+    this.getNextPage();
   }
 
-  initialize(): void {
-    this.bitstreams$ = this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL').pipe(
-      getFirstSucceededRemoteListPayload()
-    );
+  /**
+   * This method will retrieve the next page of Bitstreams from the external BitstreamDataService call.
+   * It'll retrieve the currentPage from the class variables and it'll add the next page of bitstreams with the
+   * already existing one.
+   * If the currentPage variable is undefined, we'll set it to 1 and retrieve the first page of Bitstreams
+   */
+  getNextPage(): void {
+    this.isLoading = true;
+    if (this.currentPage === undefined) {
+      this.currentPage = 1;
+      this.bitstreams$ = new BehaviorSubject([]);
+    } else {
+      this.currentPage++;
+    }
+    this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', {
+      currentPage: this.currentPage,
+      elementsPerPage: this.pageSize
+    }).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
+      if (bitstreamsRD.errorMessage) {
+        this.notificationsService.error(this.translateService.get('file-section.error.header'), `${bitstreamsRD.statusCode} ${bitstreamsRD.errorMessage}`);
+      } else if (hasValue(bitstreamsRD.payload)) {
+        const current: Bitstream[] = this.bitstreams$.getValue();
+        this.bitstreams$.next([...current, ...bitstreamsRD.payload.page]);
+        this.isLoading = false;
+        this.isLastPage = this.currentPage === bitstreamsRD.payload.totalPages;
+      }
+    });
   }
-
 }
diff --git a/src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index 4459408644f..637f9f95935 100644
--- a/src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -2,13 +2,12 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Item } from '../../../../core/shared/item.model';
-import { PaginatedList } from '../../../../core/data/paginated-list';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { PageInfo } from '../../../../core/shared/page-info.model';
 import { ItemPageFieldComponent } from './item-page-field.component';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
 import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 
 let comp: ItemPageFieldComponent;
 let fixture: ComponentFixture<ItemPageFieldComponent>;
@@ -50,7 +49,7 @@ describe('ItemPageFieldComponent', () => {
 
 export function mockItemWithMetadataFieldAndValue(field: string, value: string): Item {
   const item = Object.assign(new Item(), {
-    bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: new MetadataMap()
   });
   item.metadata[field] = [{
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index 0e8abf0a02a..e843155d10a 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -1,6 +1,7 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
   <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="itemRD?.payload as item">
+      <ds-item-alerts [item]="item"></ds-item-alerts>
       <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
       <ds-view-tracker [object]="item"></ds-view-tracker>
       <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
diff --git a/src/app/+item-page/simple/item-page.component.spec.ts b/src/app/+item-page/simple/item-page.component.spec.ts
index 6c26e759080..837eec879ab 100644
--- a/src/app/+item-page/simple/item-page.component.spec.ts
+++ b/src/app/+item-page/simple/item-page.component.spec.ts
@@ -8,21 +8,22 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { MetadataService } from '../../core/metadata/metadata.service';
 import { VarDirective } from '../../shared/utils/var.directive';
-import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { PageInfo } from '../../core/shared/page-info.model';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from './item-types/shared/item.component.spec';
 import { of as observableOf } from 'rxjs';
 import {
-  createFailedRemoteDataObject$, createPendingRemoteDataObject$, createSuccessfulRemoteDataObject,
+  createFailedRemoteDataObject$,
+  createPendingRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
+import { AuthService } from '../../core/auth/auth.service';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable()
 });
@@ -30,6 +31,7 @@ const mockItem: Item = Object.assign(new Item(), {
 describe('ItemPageComponent', () => {
   let comp: ItemPageComponent;
   let fixture: ComponentFixture<ItemPageComponent>;
+  let authService: AuthService;
 
   const mockMetadataService = {
     /* tslint:disable:no-empty */
@@ -37,10 +39,15 @@ describe('ItemPageComponent', () => {
     /* tslint:enable:no-empty */
   };
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
   });
 
   beforeEach(async(() => {
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      setRedirectUrl: {}
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
         loader: {
@@ -53,7 +60,8 @@ describe('ItemPageComponent', () => {
         {provide: ActivatedRoute, useValue: mockRoute},
         {provide: ItemDataService, useValue: {}},
         {provide: MetadataService, useValue: mockMetadataService},
-        {provide: Router, useValue: {}}
+        {provide: Router, useValue: {}},
+        { provide: AuthService, useValue: authService },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
@@ -70,7 +78,7 @@ describe('ItemPageComponent', () => {
 
   describe('when the item is loading', () => {
     beforeEach(() => {
-      comp.itemRD$ = createPendingRemoteDataObject$(undefined);
+      comp.itemRD$ = createPendingRemoteDataObject$();
       // comp.itemRD$ = observableOf(new RemoteData(true, true, true, null, undefined));
       fixture.detectChanges();
     });
@@ -83,7 +91,7 @@ describe('ItemPageComponent', () => {
 
   describe('when the item failed loading', () => {
     beforeEach(() => {
-      comp.itemRD$ = createFailedRemoteDataObject$(undefined);
+      comp.itemRD$ = createFailedRemoteDataObject$('server error', 500);
       fixture.detectChanges();
     });
 
diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts
index 10deef23e49..3267cf743af 100644
--- a/src/app/+item-page/simple/item-page.component.ts
+++ b/src/app/+item-page/simple/item-page.component.ts
@@ -11,8 +11,9 @@ import { Item } from '../../core/shared/item.model';
 import { MetadataService } from '../../core/metadata/metadata.service';
 
 import { fadeInOut } from '../../shared/animations/fade';
-import { redirectToPageNotFoundOn404 } from '../../core/shared/operators';
+import { redirectOn4xx } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { AuthService } from '../../core/auth/auth.service';
 
 /**
  * This component renders a simple item page.
@@ -48,6 +49,7 @@ export class ItemPageComponent implements OnInit {
     private router: Router,
     private items: ItemDataService,
     private metadataService: MetadataService,
+    private authService: AuthService,
   ) { }
 
   /**
@@ -55,8 +57,8 @@ export class ItemPageComponent implements OnInit {
    */
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
-      map((data) => data.item as RemoteData<Item>),
-      redirectToPageNotFoundOn404(this.router)
+      map((data) => data.dso as RemoteData<Item>),
+      redirectOn4xx(this.router, this.authService)
     );
     this.metadataService.processRemoteData(this.itemRD$);
   }
diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/+item-page/simple/item-types/publication/publication.component.html
index 9eb704b9e96..ae3d62a1089 100644
--- a/src/app/+item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/+item-page/simple/item-types/publication/publication.component.html
@@ -1,6 +1,11 @@
-<h2 class="item-page-title-field">
-  {{'publication.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
-</h2>
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    {{'publication.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'publication.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts
index 1d340e2e73d..2f16d199edd 100644
--- a/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts
@@ -12,14 +12,12 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
 import { RelationshipService } from '../../../../core/data/relationship.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MetadataMap } from '../../../../core/shared/metadata.models';
-import { PageInfo } from '../../../../core/shared/page-info.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
@@ -29,9 +27,10 @@ import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import { createRelationshipsObservable } from '../shared/item.component.spec';
 import { PublicationComponent } from './publication.component';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: new MetadataMap(),
   relationships: createRelationshipsObservable()
 });
diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.ts b/src/app/+item-page/simple/item-types/publication/publication.component.ts
index f01d0f72d3d..5ace8d04739 100644
--- a/src/app/+item-page/simple/item-types/publication/publication.component.ts
+++ b/src/app/+item-page/simple/item-types/publication/publication.component.ts
@@ -1,5 +1,4 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
 import { ItemComponent } from '../shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
@@ -9,7 +8,6 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
  */
 
 @listableObjectComponent('Publication', ViewMode.StandalonePage)
-@listableObjectComponent(Item, ViewMode.StandalonePage)
 @Component({
   selector: 'ds-publication',
   styleUrls: ['./publication.component.scss'],
diff --git a/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
index 73e02ca29df..2772dffeba7 100644
--- a/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
+++ b/src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
@@ -1,11 +1,14 @@
 import { combineLatest as observableCombineLatest, zip as observableZip } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
 import { distinctUntilChanged, flatMap, map, switchMap } from 'rxjs/operators';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFinishedRemoteData, getSucceededRemoteData } from '../../../../core/shared/operators';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteData
+} from '../../../../core/shared/operators';
 import { hasValue } from '../../../../shared/empty.util';
 
 /**
@@ -72,19 +75,22 @@ export const relationsToItems = (thisId: string) =>
 export const paginatedRelationsToItems = (thisId: string) =>
   (source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
     source.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       switchMap((relationshipsRD: RemoteData<PaginatedList<Relationship>>) => {
         return observableCombineLatest(
-          ...relationshipsRD.payload.page.map((rel: Relationship) => observableCombineLatest(rel.leftItem.pipe(getFinishedRemoteData()), rel.rightItem.pipe(getFinishedRemoteData())))
-        ).pipe(
+          relationshipsRD.payload.page.map((rel: Relationship) =>
+            observableCombineLatest([
+              rel.leftItem.pipe(getFirstSucceededRemoteDataPayload()),
+              rel.rightItem.pipe(getFirstSucceededRemoteDataPayload())]
+            )
+          )).pipe(
           map((arr) =>
             arr
-              .filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded)
               .map(([leftItem, rightItem]) => {
-                if (leftItem.payload.id === thisId) {
-                  return rightItem.payload;
-                } else if (rightItem.payload.id === thisId) {
-                  return leftItem.payload;
+                if (leftItem.id === thisId) {
+                  return rightItem;
+                } else if (rightItem.id === thisId) {
+                  return leftItem;
                 }
               })
               .filter((item: Item) => hasValue(item))
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.spec.ts b/src/app/+item-page/simple/item-types/shared/item.component.spec.ts
index fe33dfe2371..5bf2fb3acad 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.spec.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.spec.ts
@@ -12,7 +12,6 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
 import { RelationshipService } from '../../../../core/data/relationship.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
@@ -20,7 +19,6 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
@@ -31,6 +29,7 @@ import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils';
 import { ItemComponent } from './item.component';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 
 /**
  * Create a generic test for an item-page-fields component using a mockItem and the type of component
@@ -117,7 +116,7 @@ export function containsFieldInput(fields: DebugElement[], metadataKey: string):
 }
 
 export function createRelationshipsObservable() {
-  return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [
+  return createSuccessfulRemoteDataObject$(createPaginatedList([
     Object.assign(new Relationship(), {
       relationshipType: createSuccessfulRemoteDataObject$(new RelationshipType()),
       leftItem: createSuccessfulRemoteDataObject$(new Item()),
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
new file mode 100644
index 00000000000..dcb73fad106
--- /dev/null
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -0,0 +1,67 @@
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    <ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
+<div class="row">
+  <div class="col-xs-12 col-md-4">
+    <ds-metadata-field-wrapper>
+      <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
+    </ds-metadata-field-wrapper>
+    <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
+    <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
+    <ds-item-page-author-field [item]="object"></ds-item-page-author-field>
+    <ds-generic-item-page-field [item]="object"
+      [fields]="['journal.title']"
+      [label]="'item.page.journal-title'">
+    </ds-generic-item-page-field>
+    <ds-generic-item-page-field [item]="object"
+      [fields]="['journal.identifier.issn']"
+      [label]="'item.page.journal-issn'">
+    </ds-generic-item-page-field>
+    <ds-generic-item-page-field [item]="object"
+      [fields]="['journalvolume.identifier.name']"
+      [label]="'item.page.volume-title'">
+    </ds-generic-item-page-field>
+    <ds-generic-item-page-field [item]="object"
+      [fields]="['dc.publisher']"
+      [label]="'item.page.publisher'">
+    </ds-generic-item-page-field>
+  </div>
+  <div class="col-xs-12 col-md-6">
+    <ds-metadata-representation-list
+      [parentItem]="object"
+      [itemType]="'Person'"
+      [metadataField]="'dc.contributor.author'"
+      [label]="'relationships.isAuthorOf' | translate">
+    </ds-metadata-representation-list>
+    <ds-item-page-abstract-field [item]="object"></ds-item-page-abstract-field>
+    <ds-generic-item-page-field [item]="object"
+      [fields]="['dc.description']"
+      [label]="'item.page.description'">
+    </ds-generic-item-page-field>
+
+    <ds-generic-item-page-field [item]="object"
+      [fields]="['dc.subject']"
+      [separator]="','"
+      [label]="'item.page.subject'">
+    </ds-generic-item-page-field>
+    <ds-generic-item-page-field [item]="object"
+      [fields]="['dc.identifier.citation']"
+      [label]="'item.page.citation'">
+    </ds-generic-item-page-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['dc.identifier.uri']"
+      [label]="'item.page.uri'">
+    </ds-item-page-uri-field>
+    <ds-item-page-collections [item]="object"></ds-item-page-collections>
+    <div>
+      <a class="btn btn-outline-primary" [routerLink]="['/items/' + object.id + '/full']">
+        {{"item.page.link.full" | translate}}
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.scss
new file mode 100644
index 00000000000..3575cae797d
--- /dev/null
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.scss
@@ -0,0 +1 @@
+@import '../../../../../styles/variables.scss';
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
new file mode 100644
index 00000000000..93a2a223652
--- /dev/null
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
@@ -0,0 +1,112 @@
+import { HttpClient } from '@angular/common/http';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Store } from '@ngrx/store';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
+import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
+import { ItemDataService } from '../../../../core/data/item-data.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { Item } from '../../../../core/shared/item.model';
+import { MetadataMap } from '../../../../core/shared/metadata.models';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { UUIDService } from '../../../../core/shared/uuid.service';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
+import { createRelationshipsObservable } from '../shared/item.component.spec';
+import { UntypedItemComponent } from './untyped-item.component';
+
+const mockItem: Item = Object.assign(new Item(), {
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+  metadata: new MetadataMap(),
+  relationships: createRelationshipsObservable()
+});
+
+describe('UntypedItemComponent', () => {
+  let comp: UntypedItemComponent;
+  let fixture: ComponentFixture<UntypedItemComponent>;
+
+  beforeEach(async(() => {
+    const mockBitstreamDataService = {
+      getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
+        return createSuccessfulRemoteDataObject$(new Bitstream());
+      }
+    };
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot({
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock
+        }
+      })],
+      declarations: [UntypedItemComponent, GenericItemPageFieldComponent, TruncatePipe],
+      providers: [
+        { provide: ItemDataService, useValue: {} },
+        { provide: TruncatableService, useValue: {} },
+        { provide: RelationshipService, useValue: {} },
+        { provide: ObjectCacheService, useValue: {} },
+        { provide: UUIDService, useValue: {} },
+        { provide: Store, useValue: {} },
+        { provide: RemoteDataBuildService, useValue: {} },
+        { provide: CommunityDataService, useValue: {} },
+        { provide: HALEndpointService, useValue: {} },
+        { provide: NotificationsService, useValue: {} },
+        { provide: HttpClient, useValue: {} },
+        { provide: DSOChangeAnalyzer, useValue: {} },
+        { provide: DefaultChangeAnalyzer, useValue: {} },
+        { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(UntypedItemComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(async(() => {
+    fixture = TestBed.createComponent(UntypedItemComponent);
+    comp = fixture.componentInstance;
+    comp.object = mockItem;
+    fixture.detectChanges();
+  }));
+
+  it('should contain a component to display the date', () => {
+    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-date-field'));
+    expect(fields.length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('should contain a component to display the author', () => {
+    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-author-field'));
+    expect(fields.length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('should contain a component to display the abstract', () => {
+    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-abstract-field'));
+    expect(fields.length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('should contain a component to display the uri', () => {
+    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-uri-field'));
+    expect(fields.length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('should contain a component to display the collections', () => {
+    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-collections'));
+    expect(fields.length).toBeGreaterThanOrEqual(1);
+  });
+
+});
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.ts
new file mode 100644
index 00000000000..3183c42a28e
--- /dev/null
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -0,0 +1,20 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { Item } from '../../../../core/shared/item.model';
+import { ItemComponent } from '../shared/item.component';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
+/**
+ * Component that represents a publication Item page
+ */
+
+@listableObjectComponent(Item, ViewMode.StandalonePage)
+@Component({
+  selector: 'ds-untyped-item',
+  styleUrls: ['./untyped-item.component.scss'],
+  templateUrl: './untyped-item.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class UntypedItemComponent extends ItemComponent {
+
+}
diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index fc696482d0e..3b79b6f1d89 100644
--- a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -3,7 +3,7 @@ import { MetadataRepresentation } from '../../../core/shared/metadata-representa
 import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { MetadataValue } from '../../../core/shared/metadata.models';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { filter, map, switchMap } from 'rxjs/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
@@ -82,8 +82,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
         .map((metadatum: any) => Object.assign(new MetadataValue(), metadatum))
         .map((metadatum: MetadataValue) => {
           if (metadatum.isVirtual) {
-            return this.relationshipService.findById(metadatum.virtualValue, followLink('leftItem'), followLink('rightItem')).pipe(
-              getSucceededRemoteData(),
+            return this.relationshipService.findById(metadatum.virtualValue, false, followLink('leftItem'), followLink('rightItem')).pipe(
+              getFirstSucceededRemoteData(),
               switchMap((relRD: RemoteData<Relationship>) =>
                 observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe(
                   filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded),
diff --git a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts b/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
index d9e5dd9dce3..8794b804c02 100644
--- a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
+++ b/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
@@ -15,7 +15,7 @@ describe('RelatedEntitiesSearchComponent', () => {
   });
   const mockRelationType = 'publicationsOfAuthor';
   const mockConfiguration = 'publication';
-  const mockFilter= `f.${mockRelationType}=${mockItem.id}`;
+  const mockFilter= `f.${mockRelationType}=${mockItem.id},equals`;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
diff --git a/src/app/+item-page/simple/related-items/related-items-component.ts b/src/app/+item-page/simple/related-items/related-items-component.ts
index 0446e53be57..5029809e0b9 100644
--- a/src/app/+item-page/simple/related-items/related-items-component.ts
+++ b/src/app/+item-page/simple/related-items/related-items-component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { FindListOptions } from '../../../core/data/request.models';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { RelationshipService } from '../../../core/data/relationship.service';
diff --git a/src/app/+item-page/simple/related-items/related-items.component.spec.ts b/src/app/+item-page/simple/related-items/related-items.component.spec.ts
index cbfaa3b562e..1a40c74340e 100644
--- a/src/app/+item-page/simple/related-items/related-items.component.spec.ts
+++ b/src/app/+item-page/simple/related-items/related-items.component.spec.ts
@@ -2,8 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { RelatedItemsComponent } from './related-items-component';
 import { Item } from '../../../core/shared/item.model';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -11,19 +9,20 @@ import { RelationshipService } from '../../../core/data/relationship.service';
 import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 const parentItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable()
 });
 const mockItem1: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable()
 });
 const mockItem2: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable()
 });
@@ -38,7 +37,7 @@ describe('RelatedItemsComponent', () => {
   beforeEach(async(() => {
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
-        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockItems)),
+        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(mockItems)),
       }
     );
 
diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.html b/src/app/+my-dspace-page/collection-selector/collection-selector.component.html
new file mode 100644
index 00000000000..83cc4151a36
--- /dev/null
+++ b/src/app/+my-dspace-page/collection-selector/collection-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.create.submission.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <ds-collection-dropdown (selectionChange)="selectObject($event.collection)">
+    </ds-collection-dropdown>
+  </div>
+</div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.scss b/src/app/+my-dspace-page/collection-selector/collection-selector.component.scss
similarity index 100%
rename from src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.scss
rename to src/app/+my-dspace-page/collection-selector/collection-selector.component.scss
diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.spec.ts b/src/app/+my-dspace-page/collection-selector/collection-selector.component.spec.ts
new file mode 100644
index 00000000000..8d71f2e397d
--- /dev/null
+++ b/src/app/+my-dspace-page/collection-selector/collection-selector.component.spec.ts
@@ -0,0 +1,151 @@
+import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { CollectionSelectorComponent } from './collection-selector.component';
+import { CollectionDropdownComponent } from 'src/app/shared/collection-dropdown/collection-dropdown.component';
+import { Collection } from 'src/app/core/shared/collection.model';
+import { of, Observable } from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Community } from 'src/app/core/shared/community.model';
+import { FindListOptions } from 'src/app/core/data/request.models';
+import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
+import { PaginatedList } from 'src/app/core/data/paginated-list.model';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
+import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
+import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
+import { CollectionDataService } from 'src/app/core/data/collection-data.service';
+import { ChangeDetectorRef, ElementRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ActivatedRoute } from '@angular/router';
+import { hot } from 'jasmine-marbles';
+import { By } from '@angular/platform-browser';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+
+describe('CollectionSelectorComponent', () => {
+  let component: CollectionSelectorComponent;
+  let fixture: ComponentFixture<CollectionSelectorComponent>;
+  const modal = jasmine.createSpyObj('modal', ['close', 'dismiss']);
+
+  const community: Community = Object.assign(new Community(), {
+    id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    name: 'Community 1'
+  });
+
+  const collections: Collection[] = [
+    Object.assign(new Collection(), {
+      id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+      name: 'Collection 1',
+      metadata: [
+        {
+          key: 'dc.title',
+          language: 'en_US',
+          value: 'Community 1-Collection 1'
+        }],
+      parentCommunity: createSuccessfulRemoteDataObject$(community)
+    }),
+    Object.assign(new Collection(), {
+      id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+      name: 'Collection 2',
+      metadata: [
+        {
+          key: 'dc.title',
+          language: 'en_US',
+          value: 'Community 1-Collection 2'
+        }],
+      parentCommunity: createSuccessfulRemoteDataObject$(community)
+    }),
+    Object.assign(new Collection(), {
+      id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      name: 'Collection 3',
+      metadata: [
+        {
+          key: 'dc.title',
+          language: 'en_US',
+          value: 'Community 1-Collection 3'
+        }],
+      parentCommunity: createSuccessfulRemoteDataObject$(community)
+    }),
+    Object.assign(new Collection(), {
+      id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
+      name: 'Collection 4',
+      metadata: [
+        {
+          key: 'dc.title',
+          language: 'en_US',
+          value: 'Community 1-Collection 4'
+        }],
+      parentCommunity: createSuccessfulRemoteDataObject$(community)
+    }),
+    Object.assign(new Collection(), {
+      id: 'a5159760-f362-4659-9e81-e3253ad91ede',
+      name: 'Collection 5',
+      metadata: [
+        {
+          key: 'dc.title',
+          language: 'en_US',
+          value: 'Community 1-Collection 5'
+        }],
+      parentCommunity: createSuccessfulRemoteDataObject$(community)
+    })
+  ];
+
+  // tslint:disable-next-line: max-classes-per-file
+  const collectionDataServiceMock = {
+    getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<Collection>>): Observable<RemoteData<PaginatedList<Collection>>> {
+      return hot( 'a|', {
+        a: createSuccessfulRemoteDataObject(createPaginatedList(collections))
+      });
+    }
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })
+      ],
+      declarations: [ CollectionSelectorComponent, CollectionDropdownComponent ],
+      providers: [
+        {provide: CollectionDataService, useValue: collectionDataServiceMock},
+        {provide: ChangeDetectorRef, useValue: {}},
+        {provide: ElementRef, userValue: {}},
+        {provide: NgbActiveModal, useValue: modal},
+        {provide: ActivatedRoute, useValue: {}}
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionSelectorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should call selectObject', fakeAsync(() => {
+    spyOn(component, 'selectObject');
+    fixture.detectChanges();
+    tick();
+    fixture.whenStable().then(() => {
+      const collectionItem = fixture.debugElement.query(By.css('.collection-item:nth-child(2)'));
+      collectionItem.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      expect(component.selectObject).toHaveBeenCalled();
+    });
+  }));
+
+  it('should close the dialog', () => {
+    component.close();
+    expect((component as any).activeModal.close).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/+my-dspace-page/collection-selector/collection-selector.component.ts b/src/app/+my-dspace-page/collection-selector/collection-selector.component.ts
new file mode 100644
index 00000000000..f930fc3f540
--- /dev/null
+++ b/src/app/+my-dspace-page/collection-selector/collection-selector.component.ts
@@ -0,0 +1,33 @@
+import { Component } from '@angular/core';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+/**
+ * This component displays the dialog that shows the list of selectable collections
+ * on the MyDSpace page
+ */
+@Component({
+  selector: 'ds-collection-selector',
+  templateUrl: './collection-selector.component.html',
+  styleUrls: ['./collection-selector.component.scss']
+})
+export class CollectionSelectorComponent {
+
+  constructor(protected activeModal: NgbActiveModal) {}
+
+  /**
+   * Method called when an element has been selected from collection list.
+   * Its close the active modal and send selected value to the component container
+   * @param dso The selected DSpaceObject
+   */
+  selectObject(dso: DSpaceObject) {
+    this.activeModal.close(dso);
+  }
+
+  /**
+   * Close the modal
+   */
+  close() {
+    this.activeModal.close();
+  }
+}
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
index 911ba26b31b..9ae38a2205c 100644
--- a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
+++ b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
@@ -3,12 +3,18 @@
     <ds-uploader *ngIf="uploadFilesOptions.url !== ''"
                  [uploadFilesOptions]="uploadFilesOptions"
                  (onCompleteItem)="onCompleteItem($event)"
-                 (onUploadError)="onUploadError()"></ds-uploader>
+                 (onUploadError)="onUploadError($event)"
+                 (onFileSelected)="afterFileLoaded($event)"></ds-uploader>
 
   </div>
   <div class="add">
-    <a class="btn btn-lg btn-primary mt-1 ml-2" [routerLink]="['/submit']" role="button">
-      <i class="fa fa-plus-circle" aria-hidden="true"></i> {{'mydspace.new-submission' | translate}}
+    <button class="btn btn-lg btn-primary mt-1 ml-2" (click)="openDialog()" role="button" title="{{'mydspace.new-submission' | translate}}">
+      <i class="fa fa-plus-circle" aria-hidden="true"></i>
+    </button>
+  </div>
+  <div class="add">
+    <a class="btn btn-lg btn-primary mt-1 ml-2" [routerLink]="['/import-external']" role="button" title="{{'mydspace.new-submission-external' | translate}}">
+      <i class="fa fa-file-import" aria-hidden="true"></i>
     </a>
   </div>
 
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
index ac9eea6c0cf..c395408cf53 100644
--- a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
+++ b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
@@ -15,16 +15,34 @@ import { createTestComponent } from '../../shared/testing/utils.test';
 import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission.component';
 import { AppState } from '../../app.reducer';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { SharedModule } from '../../shared/shared.module';
 import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
 import { UploaderService } from '../../shared/uploader/uploader.service';
+import { By } from '@angular/platform-browser';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { HostWindowService } from '../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
+import { UploaderComponent } from 'src/app/shared/uploader/uploader.component';
 
 describe('MyDSpaceNewSubmissionComponent test', () => {
 
-  const translateService: any = getMockTranslateService();
+  const translateService: TranslateService = jasmine.createSpyObj('translateService', {
+    get: (key: string): any => { observableOf(key) },
+    instant: jasmine.createSpy('instant')
+  });
+
+  const uploader: any = jasmine.createSpyObj('uploader', {
+    clearQueue: jasmine.createSpy('clearQueue')
+  });
+
+  const modalService = {
+    open: () => {
+      return { result: new Promise((res, rej) => {/****/}) };
+    }
+  };
+
   const store: Store<AppState> = jasmine.createSpyObj('store', {
     /* tslint:disable:no-empty */
     dispatch: {},
@@ -54,9 +72,11 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         { provide: ScrollToService, useValue: getMockScrollToService() },
         { provide: Store, useValue: store },
         { provide: TranslateService, useValue: translateService },
+        { provide: NgbModal, useValue: modalService },
         ChangeDetectorRef,
         MyDSpaceNewSubmissionComponent,
-        UploaderService
+        UploaderService,
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -86,6 +106,35 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
     }));
   });
 
+  describe('', () => {
+    let fixture: ComponentFixture<MyDSpaceNewSubmissionComponent>;
+    let comp: MyDSpaceNewSubmissionComponent;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(MyDSpaceNewSubmissionComponent);
+      comp = fixture.componentInstance;
+      comp.uploadFilesOptions.authToken = 'user-auth-token';
+      comp.uploadFilesOptions.url = 'https://fake.upload-api.url';
+      comp.uploaderComponent = TestBed.createComponent(UploaderComponent).componentInstance;
+      comp.uploaderComponent.uploader = uploader;
+    });
+
+    it('should call app.openDialog', () => {
+      spyOn(comp, 'openDialog');
+      const submissionButton = fixture.debugElement.query(By.css('button.btn-primary'));
+      submissionButton.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      expect(comp.openDialog).toHaveBeenCalled();
+    });
+
+    it('should show a collection selector if only one file are uploaded', () => {
+      spyOn((comp as any).modalService, 'open').and.returnValue({ result: new Promise((res, rej) => {/****/}) });
+      comp.afterFileLoaded(['']);
+      expect((comp as any).modalService.open).toHaveBeenCalled();
+    });
+  });
 });
 
 // declare a test component
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index 81d66bb5f70..d14fe46afda 100644
--- a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -1,11 +1,10 @@
-import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
-import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
-import { SubmissionState } from '../../submission/submission.reducers';
 import { AuthService } from '../../core/auth/auth.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -15,6 +14,10 @@ import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { NotificationType } from '../../shared/notifications/models/notification-type';
 import { hasValue } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/search-result.model';
+import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { CollectionSelectorComponent } from '../collection-selector/collection-selector.component';
+import { UploaderComponent } from '../../shared/uploader/uploader.component';
+import { UploaderError } from '../../shared/uploader/uploader-error.model';
 
 /**
  * This component represents the whole mydspace page header
@@ -40,6 +43,11 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
    */
   private sub: Subscription;
 
+  /**
+   * Reference to uploaderComponent
+   */
+  @ViewChild(UploaderComponent, { static: false }) uploaderComponent: UploaderComponent;
+
   /**
    * Initialize instance variables
    *
@@ -49,19 +57,22 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
    * @param {NotificationsService} notificationsService
    * @param {Store<SubmissionState>} store
    * @param {TranslateService} translate
+   * @param {Router} router
+   * @param {NgbModal} modalService
    */
   constructor(private authService: AuthService,
               private changeDetectorRef: ChangeDetectorRef,
               private halService: HALEndpointService,
               private notificationsService: NotificationsService,
-              private store: Store<SubmissionState>,
-              private translate: TranslateService) {
+              private translate: TranslateService,
+              private modalService: NgbModal) {
   }
 
   /**
    * Initialize url and Bearer token
    */
   ngOnInit() {
+    this.uploadFilesOptions.autoUpload = false;
     this.sub = this.halService.getEndpoint('workspaceitems').pipe(first()).subscribe((url) => {
         this.uploadFilesOptions.url = url;
         this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
@@ -101,8 +112,42 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
   /**
    * Method called on file upload error
    */
-  public onUploadError() {
-    this.notificationsService.error(null, this.translate.get('mydspace.upload.upload-failed'));
+  public onUploadError(error: UploaderError) {
+    let errorMessageKey = 'mydspace.upload.upload-failed';
+    if (hasValue(error.status) && error.status === 422) {
+      errorMessageKey = 'mydspace.upload.upload-failed-manyentries';
+    }
+    this.notificationsService.error(null, this.translate.get(errorMessageKey));
+  }
+
+  /**
+   * Method called on clicking the button "New Submition", It opens a dialog for
+   * select a collection.
+   */
+  openDialog() {
+    this.modalService.open(CreateItemParentSelectorComponent);
+  }
+
+  /**
+   * Method invoked after all file are loaded from upload plugin
+   */
+  afterFileLoaded(items) {
+    const uploader = this.uploaderComponent.uploader;
+    if (hasValue(items) && items.length > 1) {
+      this.notificationsService.error(null, this.translate.get('mydspace.upload.upload-failed-moreonefile'));
+      uploader.clearQueue();
+      this.changeDetectorRef.detectChanges();
+    } else {
+      const modalRef = this.modalService.open(CollectionSelectorComponent);
+      // When the dialog are closes its takes the collection selected and
+      // uploads choosed file after adds owningCollection parameter
+      modalRef.result.then( (result) => {
+        uploader.onBuildItemForm = (fileItem: any, form: any) => {
+          form.append('owningCollection', result.uuid);
+        };
+        uploader.uploadAll();
+      });
+    }
   }
 
   /**
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.ts b/src/app/+my-dspace-page/my-dspace-page.component.ts
index 6556eaaf1f8..3e58bb8e0fb 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.component.ts
@@ -10,7 +10,7 @@ import {
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { map, switchMap, tap, } from 'rxjs/operators';
 
-import { PaginatedList } from '../core/data/paginated-list';
+import { PaginatedList } from '../core/data/paginated-list.model';
 import { RemoteData } from '../core/data/remote-data';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { pushInOut } from '../shared/animations/push';
@@ -19,7 +19,7 @@ import { PaginatedSearchOptions } from '../shared/search/paginated-search-option
 import { SearchService } from '../core/shared/search/search.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue } from '../shared/empty.util';
-import { getSucceededRemoteData } from '../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../core/shared/operators';
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
 import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
 import { RoleType } from '../core/roles/role-types';
@@ -126,7 +126,7 @@ export class MyDSpacePageComponent implements OnInit {
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.sub = this.searchOptions$.pipe(
       tap(() => this.resultsRD$.next(null)),
-      switchMap((options: PaginatedSearchOptions) => this.service.search(options).pipe(getSucceededRemoteData())))
+      switchMap((options: PaginatedSearchOptions) => this.service.search(options).pipe(getFirstSucceededRemoteData())))
       .subscribe((results) => {
         this.resultsRD$.next(results);
       });
diff --git a/src/app/+my-dspace-page/my-dspace-page.module.ts b/src/app/+my-dspace-page/my-dspace-page.module.ts
index 1cf30c4ec95..49570fec6d7 100644
--- a/src/app/+my-dspace-page/my-dspace-page.module.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.module.ts
@@ -20,6 +20,7 @@ import { SearchResultListElementComponent } from '../shared/object-list/search-r
 import { ItemSearchResultListElementSubmissionComponent } from '../shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component';
 import { WorkflowItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
 import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component';
+import { CollectionSelectorComponent } from './collection-selector/collection-selector.component';
 
 @NgModule({
   imports: [
@@ -40,7 +41,8 @@ import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/
     ClaimedTaskSearchResultDetailElementComponent,
     PoolSearchResultDetailElementComponent,
     MyDSpaceNewSubmissionComponent,
-    ItemSearchResultListElementSubmissionComponent
+    ItemSearchResultListElementSubmissionComponent,
+    CollectionSelectorComponent
   ],
   providers: [
     MyDSpaceGuard,
@@ -57,7 +59,8 @@ import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/
     WorkflowItemSearchResultDetailElementComponent,
     ClaimedTaskSearchResultDetailElementComponent,
     PoolSearchResultDetailElementComponent,
-    ItemSearchResultListElementSubmissionComponent
+    ItemSearchResultListElementSubmissionComponent,
+    CollectionSelectorComponent
   ]
 })
 
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html
index 63eb0ff9a71..3a829e6ece8 100644
--- a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html
+++ b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.html
@@ -9,5 +9,5 @@
   </ds-viewable-collection>
 </div>
 <ds-loading *ngIf="isLoading()" message="{{'loading.mydspace-results' | translate}}"></ds-loading>
-<ds-error *ngIf="searchResults?.hasFailed && (!searchResults?.error || searchResults?.error?.statusCode != 400)" message="{{'error.search-results' | translate}}"></ds-error>
+<ds-error *ngIf="searchResults?.hasFailed && (!searchResults?.errorMessage || searchResults?.statusCode != 400)" message="{{'error.search-results' | translate}}"></ds-error>
 <h3 *ngIf="searchResults?.payload?.page.length == 0" class="text-center text-muted" ><span>{{'mydspace.results.no-results' | translate}}</span></h3>
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
index abf110d3564..35b13c8bae4 100644
--- a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
@@ -2,8 +2,7 @@ import { Component, Input } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { SearchOptions } from '../../shared/search/search-options.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { isEmpty } from '../../shared/empty.util';
 import { Context } from '../../core/shared/context.model';
diff --git a/src/app/+search-page/search-tracker.component.ts b/src/app/+search-page/search-tracker.component.ts
index 7e5aa49165d..4161d6b19fc 100644
--- a/src/app/+search-page/search-tracker.component.ts
+++ b/src/app/+search-page/search-tracker.component.ts
@@ -1,18 +1,19 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Angulartics2 } from 'angulartics2';
-import { filter, map, switchMap } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
 import { SearchComponent } from './search.component';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { HostWindowService } from '../shared/host-window.service';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
 import { RouteService } from '../core/services/route.service';
-import { hasValue } from '../shared/empty.util';
-import { SearchSuccessResponse } from '../core/cache/response.models';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { SearchService } from '../core/shared/search/search.service';
 import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
-import { SearchQueryResponse } from '../shared/search/search-query-response.model';
+import { SearchObjects } from '../shared/search/search-objects.model';
 import { Router } from '@angular/router';
+import { RemoteData } from '../core/data/remote-data';
+import { DSpaceObject } from '../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteData } from '../core/shared/operators';
 
 /**
  * This component triggers a page view statistic
@@ -45,23 +46,15 @@ export class SearchTrackerComponent extends SearchComponent implements OnInit {
   ngOnInit(): void {
     // super.ngOnInit();
     this.getSearchOptions().pipe(
-      switchMap((options) => this.service.searchEntries(options)
-        .pipe(
-          filter((entry) =>
-            hasValue(entry.requestEntry)
-            && hasValue(entry.requestEntry.response)
-            && entry.requestEntry.response.isSuccessful === true
-          ),
-          map((entry) => ({
-            searchOptions: entry.searchOptions,
-            response: (entry.requestEntry.response as SearchSuccessResponse).results
-          })),
-        )
-      )
-    )
-      .subscribe((entry) => {
-        const config: PaginatedSearchOptions = entry.searchOptions;
-        const searchQueryResponse: SearchQueryResponse = entry.response;
+      switchMap((options: PaginatedSearchOptions) =>
+        this.service.searchEntries(options).pipe(
+          getFirstSucceededRemoteData(),
+          map((rd: RemoteData<SearchObjects<DSpaceObject>>) => ({
+            config: options,
+            searchQueryResponse: rd.payload
+          }))
+        )),
+    ).subscribe(({ config, searchQueryResponse }) => {
         const filters: Array<{ filter: string, operator: string, value: string, label: string; }> = [];
         const appliedFilters = searchQueryResponse.appliedFilters || [];
         for (let i = 0, filtersLength = appliedFilters.length; i < filtersLength; i++) {
@@ -74,8 +67,8 @@ export class SearchTrackerComponent extends SearchComponent implements OnInit {
             searchOptions: config,
             page: {
               size: config.pagination.size, // same as searchQueryResponse.page.elementsPerPage
-              totalElements: searchQueryResponse.page.totalElements,
-              totalPages: searchQueryResponse.page.totalPages,
+              totalElements: searchQueryResponse.pageInfo.totalElements,
+              totalPages: searchQueryResponse.pageInfo.totalPages,
               number: config.pagination.currentPage, // same as searchQueryResponse.page.currentPage
             },
             sort: {
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index bbbfdba5138..c3d416fb273 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -1,14 +1,14 @@
 import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { startWith, switchMap, } from 'rxjs/operators';
-import { PaginatedList } from '../core/data/paginated-list';
+import { PaginatedList } from '../core/data/paginated-list.model';
 import { RemoteData } from '../core/data/remote-data';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { pushInOut } from '../shared/animations/push';
 import { HostWindowService } from '../shared/host-window.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { getSucceededRemoteData } from '../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../core/shared/operators';
 import { RouteService } from '../core/services/route.service';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
 import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
@@ -122,7 +122,7 @@ export class SearchComponent implements OnInit {
     this.searchLink = this.getSearchLink();
     this.searchOptions$ = this.getSearchOptions();
     this.sub = this.searchOptions$.pipe(
-      switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(undefined))))
+      switchMap((options) => this.service.search(options).pipe(getFirstSucceededRemoteData(), startWith(undefined))))
       .subscribe((results) => {
         this.resultsRD$.next(results);
       });
diff --git a/src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 43c3e90152d..451469b5e44 100644
--- a/src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/app/+workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -7,6 +7,10 @@ import { RouteService } from '../../core/services/route.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { RequestService } from '../../core/data/request.service';
+import { map } from 'rxjs/operators';
+import { RemoteData } from '../../core/data/remote-data';
+import { NoContent } from '../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 
 @Component({
   selector: 'ds-workflow-item-delete',
@@ -39,6 +43,9 @@ export class WorkflowItemDeleteComponent extends WorkflowItemActionPageComponent
    */
   sendRequest(id: string): Observable<boolean> {
     this.requestService.removeByHrefSubstring('/discover');
-    return this.workflowItemService.delete(id);
+    return this.workflowItemService.delete(id).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+    );
   }
 }
diff --git a/src/app/+workflowitems-edit-page/workflow-item-page.resolver.spec.ts b/src/app/+workflowitems-edit-page/workflow-item-page.resolver.spec.ts
index 792c642ec77..8f6a1f1de09 100644
--- a/src/app/+workflowitems-edit-page/workflow-item-page.resolver.spec.ts
+++ b/src/app/+workflowitems-edit-page/workflow-item-page.resolver.spec.ts
@@ -1,7 +1,7 @@
 import { first } from 'rxjs/operators';
-import { of as observableOf } from 'rxjs';
 import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 
 describe('WorkflowItemPageResolver', () => {
   describe('resolve', () => {
@@ -11,17 +11,18 @@ describe('WorkflowItemPageResolver', () => {
 
     beforeEach(() => {
       wfiService = {
-        findById: (id: string) => observableOf({ payload: { id }, hasSucceeded: true }) as any
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
       } as any;
       resolver = new WorkflowItemPageResolver(wfiService);
     });
 
-    it('should resolve a workflow item with the correct id', () => {
+    it('should resolve a workflow item with the correct id', (done) => {
       resolver.resolve({ params: { id: uuid } } as any, undefined)
         .pipe(first())
         .subscribe(
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
+            done();
           }
         );
     });
diff --git a/src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts
index 19cc4b4914e..6fc960f13c3 100644
--- a/src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts
+++ b/src/app/+workflowitems-edit-page/workflow-item-page.resolver.ts
@@ -2,11 +2,10 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../core/data/remote-data';
-import { hasValue } from '../shared/empty.util';
-import { find } from 'rxjs/operators';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
  * This class represents a resolver that requests a specific workflow item before the route is activated
@@ -25,9 +24,10 @@ export class WorkflowItemPageResolver implements Resolve<RemoteData<WorkflowItem
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<WorkflowItem>> {
     return this.workflowItemService.findById(route.params.id,
+      false,
       followLink('item'),
     ).pipe(
-      find((RD) => hasValue(RD.error) || RD.hasSucceeded),
+      getFirstCompletedRemoteData(),
     );
   }
 }
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
new file mode 100644
index 00000000000..7d09a6915ec
--- /dev/null
+++ b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
@@ -0,0 +1,22 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { getWorkflowItemModuleRoute } from '../app-routing-paths';
+
+export function getWorkflowItemPageRoute(wfiId: string) {
+  return new URLCombiner(getWorkflowItemModuleRoute(), wfiId).toString();
+}
+
+export function getWorkflowItemEditRoute(wfiId: string) {
+  return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_EDIT_PATH).toString()
+}
+
+export function getWorkflowItemDeleteRoute(wfiId: string) {
+  return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_DELETE_PATH).toString()
+}
+
+export function getWorkflowItemSendBackRoute(wfiId: string) {
+  return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_SEND_BACK_PATH).toString()
+}
+
+export const WORKFLOW_ITEM_EDIT_PATH = 'edit';
+export const WORKFLOW_ITEM_DELETE_PATH = 'delete';
+export const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback';
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
index e9989bf947e..27b7fe1199a 100644
--- a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
+++ b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
@@ -3,31 +3,14 @@ import { RouterModule } from '@angular/router';
 
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { SubmissionEditComponent } from '../submission/edit/submission-edit.component';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getWorkflowItemModulePath } from '../app-routing.module';
 import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-item-delete.component';
 import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
 import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component';
-
-export function getWorkflowItemPageRoute(wfiId: string) {
-  return new URLCombiner(getWorkflowItemModulePath(), wfiId).toString();
-}
-
-export function getWorkflowItemEditPath(wfiId: string) {
-  return new URLCombiner(getWorkflowItemModulePath(), wfiId, WORKFLOW_ITEM_EDIT_PATH).toString()
-}
-
-export function getWorkflowItemDeletePath(wfiId: string) {
-  return new URLCombiner(getWorkflowItemModulePath(), wfiId, WORKFLOW_ITEM_DELETE_PATH).toString()
-}
-
-export function getWorkflowItemSendBackPath(wfiId: string) {
-  return new URLCombiner(getWorkflowItemModulePath(), wfiId, WORKFLOW_ITEM_SEND_BACK_PATH).toString()
-}
-
-const WORKFLOW_ITEM_EDIT_PATH = 'edit';
-const WORKFLOW_ITEM_DELETE_PATH = 'delete';
-const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback';
+import {
+  WORKFLOW_ITEM_SEND_BACK_PATH,
+  WORKFLOW_ITEM_DELETE_PATH,
+  WORKFLOW_ITEM_EDIT_PATH
+} from './workflowitems-edit-page-routing-paths';
 
 @NgModule({
   imports: [
diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts
new file mode 100644
index 00000000000..8db4ba5aa7d
--- /dev/null
+++ b/src/app/app-routing-paths.ts
@@ -0,0 +1,73 @@
+import { DSpaceObject } from './core/shared/dspace-object.model';
+import { Community } from './core/shared/community.model';
+import { Collection } from './core/shared/collection.model';
+import { Item } from './core/shared/item.model';
+import { getCommunityPageRoute } from './+community-page/community-page-routing-paths';
+import { getCollectionPageRoute } from './+collection-page/collection-page-routing-paths';
+import { getItemPageRoute } from './+item-page/item-page-routing-paths';
+
+export const BITSTREAM_MODULE_PATH = 'bitstreams';
+
+export function getBitstreamModuleRoute() {
+  return `/${BITSTREAM_MODULE_PATH}`;
+}
+
+export const ADMIN_MODULE_PATH = 'admin';
+
+export function getAdminModuleRoute() {
+  return `/${ADMIN_MODULE_PATH}`;
+}
+
+export const PROFILE_MODULE_PATH = 'profile';
+
+export function getProfileModuleRoute() {
+  return `/${PROFILE_MODULE_PATH}`;
+}
+
+export const REGISTER_PATH = 'register';
+
+export function getRegisterRoute() {
+  return `/${REGISTER_PATH}`;
+
+}
+
+export const FORGOT_PASSWORD_PATH = 'forgot';
+
+export function getForgotPasswordRoute() {
+  return `/${FORGOT_PASSWORD_PATH}`;
+
+}
+
+export const WORKFLOW_ITEM_MODULE_PATH = 'workflowitems';
+
+export function getWorkflowItemModuleRoute() {
+  return `/${WORKFLOW_ITEM_MODULE_PATH}`;
+}
+
+export function getDSORoute(dso: DSpaceObject): string {
+  switch ((dso as any).type) {
+    case Community.type.value:
+      return getCommunityPageRoute(dso.uuid);
+    case Collection.type.value:
+      return getCollectionPageRoute(dso.uuid);
+    case Item.type.value:
+      return getItemPageRoute(dso.uuid);
+  }
+}
+
+export const FORBIDDEN_PATH = '403';
+
+export function getForbiddenRoute() {
+  return `/${FORBIDDEN_PATH}`;
+}
+
+export const PAGE_NOT_FOUND_PATH = '404';
+
+export function getPageNotFoundRoute() {
+  return `/${PAGE_NOT_FOUND_PATH}`;
+}
+
+export const INFO_MODULE_PATH = 'info';
+export function getInfoModulePath() {
+  return `/${INFO_MODULE_PATH}`;
+}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index f4b02d87744..ddf4ab2e68f 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,105 +1,82 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
 
 import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
 import { AuthenticatedGuard } from './core/auth/authenticated.guard';
-import { DSpaceObject } from './core/shared/dspace-object.model';
-import { Community } from './core/shared/community.model';
-import { getCommunityPageRoute } from './+community-page/community-page-routing.module';
-import { Collection } from './core/shared/collection.model';
-import { Item } from './core/shared/item.model';
-import { getItemPageRoute } from './+item-page/item-page-routing.module';
-import { getCollectionPageRoute } from './+collection-page/collection-page-routing.module';
-
-const ITEM_MODULE_PATH = 'items';
-
-export function getItemModulePath() {
-  return `/${ITEM_MODULE_PATH}`;
-}
-
-const COLLECTION_MODULE_PATH = 'collections';
-
-export function getCollectionModulePath() {
-  return `/${COLLECTION_MODULE_PATH}`;
-}
-
-const COMMUNITY_MODULE_PATH = 'communities';
-
-export function getCommunityModulePath() {
-  return `/${COMMUNITY_MODULE_PATH}`;
-}
-const BITSTREAM_MODULE_PATH = 'bitstreams';
-export function getBitstreamModulePath() {
-  return `/${BITSTREAM_MODULE_PATH}`;
-}
-
-const ADMIN_MODULE_PATH = 'admin';
-
-export function getAdminModulePath() {
-  return `/${ADMIN_MODULE_PATH}`;
-}
-
-const PROFILE_MODULE_PATH = 'profile';
-
-export function getProfileModulePath() {
-  return `/${PROFILE_MODULE_PATH}`;
-}
-
-const WORKFLOW_ITEM_MODULE_PATH = 'workflowitems';
-
-export function getWorkflowItemModulePath() {
-  return `/${WORKFLOW_ITEM_MODULE_PATH}`;
-}
-
-export function getDSOPath(dso: DSpaceObject): string {
-  switch ((dso as any).type) {
-    case Community.type.value:
-      return getCommunityPageRoute(dso.uuid);
-    case Collection.type.value:
-      return getCollectionPageRoute(dso.uuid);
-    case Item.type.value:
-      return getItemPageRoute(dso.uuid);
-  }
-}
+import { SiteAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import {
+  WORKFLOW_ITEM_MODULE_PATH,
+  FORGOT_PASSWORD_PATH,
+  REGISTER_PATH,
+  PROFILE_MODULE_PATH,
+  ADMIN_MODULE_PATH,
+  BITSTREAM_MODULE_PATH,
+  INFO_MODULE_PATH,
+  FORBIDDEN_PATH,
+} from './app-routing-paths';
+import { COLLECTION_MODULE_PATH } from './+collection-page/collection-page-routing-paths';
+import { COMMUNITY_MODULE_PATH } from './+community-page/community-page-routing-paths';
+import { ITEM_MODULE_PATH } from './+item-page/item-page-routing-paths';
+import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
+import { ReloadGuard } from './core/reload/reload.guard';
+import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
+import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
+import { ForbiddenComponent } from './forbidden/forbidden.component';
 
 @NgModule({
   imports: [
     RouterModule.forRoot([
-      { path: '', redirectTo: '/home', pathMatch: 'full' },
-      { path: 'reload/:rnd', redirectTo: '/home', pathMatch: 'full' },
-      { path: 'home', loadChildren: './+home-page/home-page.module#HomePageModule', data: { showBreadcrumbs: false } },
-      { path: 'community-list', loadChildren: './community-list-page/community-list-page.module#CommunityListPageModule' },
-      { path: 'id', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule' },
-      { path: 'handle', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule' },
-      { path: COMMUNITY_MODULE_PATH, loadChildren: './+community-page/community-page.module#CommunityPageModule' },
-      { path: COLLECTION_MODULE_PATH, loadChildren: './+collection-page/collection-page.module#CollectionPageModule' },
-      { path: ITEM_MODULE_PATH, loadChildren: './+item-page/item-page.module#ItemPageModule' },
-      { path: BITSTREAM_MODULE_PATH, loadChildren: './+bitstream-page/bitstream-page.module#BitstreamPageModule' },
-      {
-        path: 'mydspace',
-        loadChildren: './+my-dspace-page/my-dspace-page.module#MyDSpacePageModule',
-        canActivate: [AuthenticatedGuard]
-      },
-      { path: 'search', loadChildren: './+search-page/search-page-routing.module#SearchPageRoutingModule' },
-      { path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule'},
-      { path: ADMIN_MODULE_PATH, loadChildren: './+admin/admin.module#AdminModule', canActivate: [AuthenticatedGuard] },
-      { path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
-      { path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
-      { path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' },
-      {
-        path: 'workspaceitems',
-        loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule'
-      },
-      {
-        path: WORKFLOW_ITEM_MODULE_PATH,
-        loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowItemsEditPageModule'
-      },
-      {
-        path: PROFILE_MODULE_PATH,
-        loadChildren: './profile-page/profile-page.module#ProfilePageModule', canActivate: [AuthenticatedGuard]
-      },
-      { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
-    ],
+        { path: '', canActivate: [AuthBlockingGuard],
+          children: [
+            { path: '', redirectTo: '/home', pathMatch: 'full' },
+            { path: 'reload/:rnd', component: PageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] },
+            { path: 'home', loadChildren: './+home-page/home-page.module#HomePageModule', data: { showBreadcrumbs: false }, canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: 'community-list', loadChildren: './community-list-page/community-list-page.module#CommunityListPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: 'id', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: 'handle', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: REGISTER_PATH, loadChildren: './register-page/register-page.module#RegisterPageModule', canActivate: [SiteRegisterGuard] },
+            { path: FORGOT_PASSWORD_PATH, loadChildren: './forgot-password/forgot-password.module#ForgotPasswordModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: COMMUNITY_MODULE_PATH, loadChildren: './+community-page/community-page.module#CommunityPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: COLLECTION_MODULE_PATH, loadChildren: './+collection-page/collection-page.module#CollectionPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: ITEM_MODULE_PATH, loadChildren: './+item-page/item-page.module#ItemPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: BITSTREAM_MODULE_PATH, loadChildren: './+bitstream-page/bitstream-page.module#BitstreamPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            {
+              path: 'mydspace',
+              loadChildren: './+my-dspace-page/my-dspace-page.module#MyDSpacePageModule',
+              canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            },
+            { path: 'search', loadChildren: './+search-page/search-page-routing.module#SearchPageRoutingModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: ADMIN_MODULE_PATH, loadChildren: './+admin/admin.module#AdminModule', canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard] },
+            { path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
+            { path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
+            { path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            { path: 'import-external', loadChildren: './+import-external-page/import-external-page.module#ImportExternalPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
+            {
+              path: 'workspaceitems',
+              loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule',
+              canActivate: [EndUserAgreementCurrentUserGuard]
+            },
+            {
+              path: WORKFLOW_ITEM_MODULE_PATH,
+              loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowItemsEditPageModule',
+              canActivate: [EndUserAgreementCurrentUserGuard]
+            },
+            {
+              path: PROFILE_MODULE_PATH,
+              loadChildren: './profile-page/profile-page.module#ProfilePageModule', canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            },
+            { path: PROCESS_MODULE_PATH, loadChildren: './process-page/process-page.module#ProcessPageModule', canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard] },
+            { path: INFO_MODULE_PATH, loadChildren: './info/info.module#InfoModule' },
+            { path: FORBIDDEN_PATH, component: ForbiddenComponent },
+            {
+              path: 'statistics',
+              loadChildren: './statistics-page/statistics-page-routing.module#StatisticsPageRoutingModule',
+            },
+            { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
+          ]}
+      ],
     {
       onSameUrlNavigation: 'reload',
     })
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 8656970f319..fa534855e79 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,4 @@
-<div class="outer-wrapper">
+<div class="outer-wrapper" *ngIf="isNotAuthBlocking$ | async; else authLoader">
     <ds-admin-sidebar></ds-admin-sidebar>
     <div class="inner-wrapper"  [@slideSidebarPadding]="{
      value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
@@ -23,3 +23,8 @@
         <ds-footer></ds-footer>
     </div>
 </div>
+<ng-template #authLoader>
+  <div class="text-center ds-full-screen-loader d-flex align-items-center flex-column justify-content-center">
+    <ds-loading [showMessage]="false"></ds-loading>
+  </div>
+</ng-template>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index 7793b7529c7..b18e7e1402c 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -47,3 +47,7 @@ ds-admin-sidebar {
   position: fixed;
   z-index: $sidebar-z-index;
 }
+
+.ds-full-screen-loader {
+  height: 100vh;
+}
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 9e24790fa1b..31507831bea 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -1,35 +1,21 @@
-import {
-  async,
-  ComponentFixture,
-  inject,
-  TestBed
-} from '@angular/core/testing';
-
-import {
-  CUSTOM_ELEMENTS_SCHEMA,
-  DebugElement
-} from '@angular/core';
-
+import * as ngrx from '@ngrx/store';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
-
-import { By } from '@angular/platform-browser';
-
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Store, StoreModule } from '@ngrx/store';
+import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 
 // Load the implementations that should be tested
 import { AppComponent } from './app.component';
-
 import { HostWindowState } from './shared/search/host-window.reducer';
 import { HostWindowResizeAction } from './shared/host-window.actions';
-
 import { MetadataService } from './core/metadata/metadata.service';
 
 import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
-
 import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
 import { MetadataServiceMock } from './shared/mocks/metadata-service.mock';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 import { AngularticsMock } from './shared/mocks/angulartics.service.mock';
 import { AuthServiceMock } from './shared/mocks/auth.service.mock';
 import { AuthService } from './core/auth/auth.service';
@@ -39,29 +25,33 @@ import { CSSVariableServiceStub } from './shared/testing/css-variable-service.st
 import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { HostWindowService } from './shared/host-window.service';
 import { HostWindowServiceStub } from './shared/testing/host-window-service.stub';
-import { ActivatedRoute, Router } from '@angular/router';
 import { RouteService } from './core/services/route.service';
 import { MockActivatedRoute } from './shared/mocks/active-router.mock';
 import { RouterMock } from './shared/mocks/router.mock';
-import { CookieServiceMock } from './shared/mocks/cookie.service.mock';
-import { CookieService } from './core/services/cookie.service';
 import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 import { storeModuleConfig } from './app.reducer';
+import { LocaleService } from './core/locale/locale.service';
+import { authReducer } from './core/auth/auth.reducer';
+import { cold } from 'jasmine-marbles';
 
 let comp: AppComponent;
 let fixture: ComponentFixture<AppComponent>;
-let de: DebugElement;
-let el: HTMLElement;
 const menuService = new MenuServiceStub();
 
 describe('App component', () => {
 
+  function getMockLocaleService(): LocaleService {
+    return jasmine.createSpyObj('LocaleService', {
+      setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode')
+    })
+  }
+
   // async beforeEach
   beforeEach(async(() => {
     return TestBed.configureTestingModule({
       imports: [
         CommonModule,
-        StoreModule.forRoot({}, storeModuleConfig),
+        StoreModule.forRoot(authReducer, storeModuleConfig),
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -81,7 +71,7 @@ describe('App component', () => {
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
-        { provide: CookieService, useValue: new CookieServiceMock()},
+        { provide: LocaleService, useValue: getMockLocaleService() },
         AppComponent,
         RouteService
       ],
@@ -91,12 +81,19 @@ describe('App component', () => {
 
   // synchronous beforeEach
   beforeEach(() => {
-    fixture = TestBed.createComponent(AppComponent);
+    spyOnProperty(ngrx, 'select').and.callFake(() => {
+      return () => {
+        return () => cold('a', {
+          a: {
+            core: { auth: { loading: false } }
+          }
+        })
+      };
+    });
 
+    fixture = TestBed.createComponent(AppComponent);
     comp = fixture.componentInstance; // component test instance
-    // query for the <div class='outer-wrapper'> by CSS element selector
-    de = fixture.debugElement.query(By.css('div.outer-wrapper'));
-    el = de.nativeElement;
+    fixture.detectChanges();
   });
 
   it('should create component', inject([AppComponent], (app: AppComponent) => {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 832a7b642f6..43ae0534ad1 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,33 +1,38 @@
-import { delay, filter, map, take } from 'rxjs/operators';
-import { AfterViewInit, ChangeDetectionStrategy, Component, HostListener, Inject, OnInit, ViewEncapsulation } from '@angular/core';
+import { delay, map, distinctUntilChanged, filter, take } from 'rxjs/operators';
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  Component,
+  HostListener,
+  Inject,
+  OnInit, Optional,
+  ViewEncapsulation
+} from '@angular/core';
 import { NavigationCancel, NavigationEnd, NavigationStart, Router } from '@angular/router';
 
+import { BehaviorSubject, combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
 import { select, Store } from '@ngrx/store';
-
 import { TranslateService } from '@ngx-translate/core';
+import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 
 import { MetadataService } from './core/metadata/metadata.service';
 import { HostWindowResizeAction } from './shared/host-window.actions';
 import { HostWindowState } from './shared/search/host-window.reducer';
 import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
-import { isAuthenticated } from './core/auth/selectors';
+import { isAuthenticationBlocking } from './core/auth/selectors';
 import { AuthService } from './core/auth/auth.service';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
-import variables from '../styles/_exposed_variables.scss';
 import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
 import { MenuService } from './shared/menu/menu.service';
 import { MenuID } from './shared/menu/initial-menus-state';
-import { BehaviorSubject, combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
 import { slideSidebarPadding } from './shared/animations/slide';
 import { HostWindowService } from './shared/host-window.service';
 import { Theme } from '../config/theme.inferface';
-import { isNotEmpty } from './shared/empty.util';
-import { CookieService } from './core/services/cookie.service';
 import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 import { environment } from '../environments/environment';
 import { models } from './core/core.module';
-
-export const LANG_COOKIE = 'language_cookie';
+import { LocaleService } from './core/locale/locale.service';
+import { hasValue } from './shared/empty.util';
+import { KlaroService } from './shared/cookies/klaro.service';
 
 @Component({
   selector: 'ds-app',
@@ -47,6 +52,11 @@ export class AppComponent implements OnInit, AfterViewInit {
   notificationOptions = environment.notifications;
   models;
 
+  /**
+   * Whether or not the authentication is currently blocking the UI
+   */
+  isNotAuthBlocking$: Observable<boolean>;
+
   constructor(
     @Inject(NativeWindowService) private _window: NativeWindowRef,
     private translate: TranslateService,
@@ -59,31 +69,20 @@ export class AppComponent implements OnInit, AfterViewInit {
     private cssService: CSSVariableService,
     private menuService: MenuService,
     private windowService: HostWindowService,
-    private cookie: CookieService
+    private localeService: LocaleService,
+    @Optional() private cookiesService: KlaroService
   ) {
+
     /* Use models object so all decorators are actually called */
     this.models = models;
     // Load all the languages that are defined as active from the config file
     translate.addLangs(environment.languages.filter((LangConfig) => LangConfig.active === true).map((a) => a.code));
 
     // Load the default language from the config file
-    translate.setDefaultLang(environment.defaultLanguage);
-
-    // Attempt to get the language from a cookie
-    const lang = cookie.get(LANG_COOKIE);
-    if (isNotEmpty(lang)) {
-      // Cookie found
-      // Use the language from the cookie
-      translate.use(lang);
-    } else {
-      // Cookie not found
-      // Attempt to get the browser language from the user
-      if (translate.getLangs().includes(translate.getBrowserLang())) {
-        translate.use(translate.getBrowserLang());
-      } else {
-        translate.use(environment.defaultLanguage);
-      }
-    }
+    // translate.setDefaultLang(environment.defaultLanguage);
+
+    // set the current language code
+    this.localeService.setCurrentLanguageCode();
 
     angulartics2GoogleAnalytics.startTracking();
     angulartics2DSpace.startTracking();
@@ -94,19 +93,25 @@ export class AppComponent implements OnInit, AfterViewInit {
       console.info(environment);
     }
     this.storeCSSVariables();
+
   }
 
   ngOnInit() {
+    this.isNotAuthBlocking$ = this.store.pipe(select(isAuthenticationBlocking)).pipe(
+      map((isBlocking: boolean) => isBlocking === false),
+      distinctUntilChanged()
+    );
+    this.isNotAuthBlocking$
+      .pipe(
+        filter((notBlocking: boolean) => notBlocking),
+        take(1)
+      ).subscribe(() => this.initializeKlaro());
+
     const env: string = environment.production ? 'Production' : 'Development';
     const color: string = environment.production ? 'red' : 'green';
     console.info(`Environment: %c${env}`, `color: ${color}; font-weight: bold;`);
     this.dispatchWindowSize(this._window.nativeWindow.innerWidth, this._window.nativeWindow.innerHeight);
 
-    // Whether is not authenticathed try to retrieve a possible stored auth token
-    this.store.pipe(select(isAuthenticated),
-      take(1),
-      filter((authenticated) => !authenticated)
-    ).subscribe((authenticated) => this.authService.checkAuthenticationToken());
     this.sidebarVisible = this.menuService.isMenuVisible(MenuID.ADMIN);
 
     this.collapsedSidebarWidth = this.cssService.getVariable('collapsedSidebarWidth');
@@ -140,15 +145,15 @@ export class AppComponent implements OnInit, AfterViewInit {
       // More information on this bug-fix: https://blog.angular-university.io/angular-debugging/
       delay(0)
     ).subscribe((event) => {
-        if (event instanceof NavigationStart) {
-          this.isLoading$.next(true);
-        } else if (
-          event instanceof NavigationEnd ||
-          event instanceof NavigationCancel
-        ) {
-          this.isLoading$.next(false);
-        }
-      });
+      if (event instanceof NavigationStart) {
+        this.isLoading$.next(true);
+      } else if (
+        event instanceof NavigationEnd ||
+        event instanceof NavigationCancel
+      ) {
+        this.isLoading$.next(false);
+      }
+    });
   }
 
   @HostListener('window:resize', ['$event'])
@@ -162,4 +167,9 @@ export class AppComponent implements OnInit, AfterViewInit {
     );
   }
 
+  private initializeKlaro() {
+    if (hasValue(this.cookiesService)) {
+      this.cookiesService.initialize()
+    }
+  }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ced019a6f94..fcb6ef0ebc9 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,11 +1,11 @@
 import { APP_BASE_HREF, CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
-import { NgModule } from '@angular/core';
+import { APP_INITIALIZER, NgModule } from '@angular/core';
 
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EffectsModule } from '@ngrx/effects';
 import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
-import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
+import { MetaReducer, Store, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -21,6 +21,7 @@ import { AppComponent } from './app.component';
 import { appEffects } from './app.effects';
 import { appMetaReducers, debugMetaReducers } from './app.metareducers';
 import { appReducers, AppState, storeModuleConfig } from './app.reducer';
+import { CheckAuthenticationTokenAction } from './core/auth/auth.actions';
 
 import { CoreModule } from './core/core.module';
 import { ClientCookieService } from './core/services/client-cookie.service';
@@ -40,6 +41,7 @@ import { SharedModule } from './shared/shared.module';
 import { BreadcrumbsComponent } from './breadcrumbs/breadcrumbs.component';
 import { environment } from '../environments/environment';
 import { BrowserModule } from '@angular/platform-browser';
+import { ForbiddenComponent } from './forbidden/forbidden.component';
 
 export function getBase() {
   return environment.ui.nameSpace;
@@ -90,6 +92,15 @@ const PROVIDERS = [
     useClass: DSpaceRouterStateSerializer
   },
   ClientCookieService,
+  // Check the authentication token when the app initializes
+  {
+    provide: APP_INITIALIZER,
+    useFactory: (store: Store<AppState>,) => {
+      return () => store.dispatch(new CheckAuthenticationTokenAction());
+    },
+    deps: [ Store ],
+    multi: true
+  },
   ...DYNAMIC_MATCHER_PROVIDERS,
 ];
 
@@ -105,6 +116,8 @@ const DECLARATIONS = [
   NotificationComponent,
   NotificationsBoardComponent,
   SearchNavbarComponent,
+  BreadcrumbsComponent,
+  ForbiddenComponent,
 ];
 
 const EXPORTS = [
@@ -122,7 +135,6 @@ const EXPORTS = [
   ],
   declarations: [
     ...DECLARATIONS,
-    BreadcrumbsComponent,
   ],
   exports: [
     ...EXPORTS
diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html
index b773964d1e6..1f142526e27 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.html
+++ b/src/app/breadcrumbs/breadcrumbs.component.html
@@ -1,17 +1,20 @@
-<nav *ngIf="showBreadcrumbs" aria-label="breadcrumb">
-    <ol class="breadcrumb">
-        <ng-container *ngTemplateOutlet="breadcrumbs.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'Home', url: '/'}"></ng-container>
-        <ng-container *ngFor="let bc of breadcrumbs; let last = last;">
-            <ng-container *ngTemplateOutlet="!last ? breadcrumb : activeBreadcrumb; context: bc"></ng-container>
-        </ng-container>
-    </ol>
-</nav>
+<ng-container *ngVar="(breadcrumbs$ | async) as breadcrumbs">
+    <nav *ngIf="showBreadcrumbs" aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <ng-container
+                    *ngTemplateOutlet="breadcrumbs?.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'home.breadcrumbs', url: '/'}"></ng-container>
+            <ng-container *ngFor="let bc of breadcrumbs; let last = last;">
+                <ng-container *ngTemplateOutlet="!last ? breadcrumb : activeBreadcrumb; context: bc"></ng-container>
+            </ng-container>
+        </ol>
+    </nav>
 
-<ng-template #breadcrumb let-text="text" let-url="url">
-    <li class="breadcrumb-item"><a [routerLink]="url">{{text | translate}}</a></li>
-</ng-template>
+    <ng-template #breadcrumb let-text="text" let-url="url">
+        <li class="breadcrumb-item"><a [routerLink]="url">{{text | translate}}</a></li>
+    </ng-template>
 
-<ng-template #activeBreadcrumb let-text="text" >
-    <li class="breadcrumb-item active" aria-current="page">{{text | translate}}</li>
-</ng-template>
+    <ng-template #activeBreadcrumb let-text="text">
+        <li class="breadcrumb-item active" aria-current="page">{{text | translate}}</li>
+    </ng-template>
+</ng-container>
 
diff --git a/src/app/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/breadcrumbs/breadcrumbs.component.spec.ts
index 6b903e761a4..32b5dcf0d00 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.spec.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.spec.ts
@@ -9,6 +9,9 @@ import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
 import { BreadcrumbConfig } from './breadcrumb/breadcrumb-config.model';
 import { BreadcrumbsService } from '../core/breadcrumbs/breadcrumbs.service';
 import { Breadcrumb } from './breadcrumb/breadcrumb.model';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { VarDirective } from '../shared/utils/var.directive';
 import { getTestScheduler } from 'jasmine-marbles';
 
 class TestBreadcrumbsService implements BreadcrumbsService<string> {
@@ -64,17 +67,16 @@ describe('BreadcrumbsComponent', () => {
   beforeEach(async(() => {
     init();
     TestBed.configureTestingModule({
-      declarations: [BreadcrumbsComponent],
+      declarations: [BreadcrumbsComponent, VarDirective],
       imports: [RouterTestingModule.withRoutes([]), TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
           useClass: TranslateLoaderMock
         }
-      })],
+      }), NgbModule],
       providers: [
-        { provide: ActivatedRoute, useValue: route }
-
-      ]
+        {provide: ActivatedRoute, useValue: route}
+      ], schemas: [NO_ERRORS_SCHEMA]
     })
       .compileComponents();
   }));
@@ -92,14 +94,16 @@ describe('BreadcrumbsComponent', () => {
 
   describe('ngOnInit', () => {
     beforeEach(() => {
-      spyOn(component, 'resolveBreadcrumbs').and.returnValue(observableOf([]))
+      spyOn(component, 'resolveBreadcrumbs').and.returnValue(observableOf([]));
     });
 
     it('should call resolveBreadcrumb on init', () => {
       router.events = observableOf(new NavigationEnd(0, '', ''));
       component.ngOnInit();
+      fixture.detectChanges();
+
       expect(component.resolveBreadcrumbs).toHaveBeenCalledWith(route.root);
-    })
+    });
   });
 
   describe('resolveBreadcrumbs', () => {
diff --git a/src/app/breadcrumbs/breadcrumbs.component.ts b/src/app/breadcrumbs/breadcrumbs.component.ts
index 2bba3c76b66..af63ec985d2 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { Breadcrumb } from './breadcrumb/breadcrumb.model';
-import { hasNoValue, hasValue, isNotUndefined, isUndefined } from '../shared/empty.util';
+import { hasNoValue, hasValue, isUndefined } from '../shared/empty.util';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { combineLatest, Observable, Subscription, of as observableOf } from 'rxjs';
+import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 
 /**
  * Component representing the breadcrumbs of a page
@@ -13,22 +13,17 @@ import { combineLatest, Observable, Subscription, of as observableOf } from 'rxj
   templateUrl: './breadcrumbs.component.html',
   styleUrls: ['./breadcrumbs.component.scss']
 })
-export class BreadcrumbsComponent implements OnInit, OnDestroy {
+export class BreadcrumbsComponent implements OnInit {
   /**
-   * List of breadcrumbs for this page
+   * Observable of the list of breadcrumbs for this page
    */
-  breadcrumbs: Breadcrumb[];
+  breadcrumbs$: Observable<Breadcrumb[]>;
 
   /**
    * Whether or not to show breadcrumbs on this page
    */
   showBreadcrumbs: boolean;
 
-  /**
-   * Subscription to unsubscribe from on destroy
-   */
-  subscription: Subscription;
-
   constructor(
     private route: ActivatedRoute,
     private router: Router
@@ -39,14 +34,11 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy {
    * Sets the breadcrumbs on init for this page
    */
   ngOnInit(): void {
-    this.subscription = this.router.events.pipe(
+    this.breadcrumbs$ = this.router.events.pipe(
       filter((e): e is NavigationEnd => e instanceof NavigationEnd),
       tap(() => this.reset()),
-      switchMap(() => this.resolveBreadcrumbs(this.route.root))
-    ).subscribe((breadcrumbs) => {
-        this.breadcrumbs = breadcrumbs;
-      }
-    )
+      switchMap(() => this.resolveBreadcrumbs(this.route.root)),
+    );
   }
 
   /**
@@ -81,20 +73,10 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy {
     return !last ? this.resolveBreadcrumbs(route.firstChild) : observableOf([]);
   }
 
-  /**
-   * Unsubscribe from subscription
-   */
-  ngOnDestroy(): void {
-    if (hasValue(this.subscription)) {
-      this.subscription.unsubscribe();
-    }
-  }
-
   /**
    * Resets the state of the breadcrumbs
    */
   reset() {
-    this.breadcrumbs = [];
     this.showBreadcrumbs = true;
   }
 }
diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts
index 3a9d9f2077d..041785e9e8e 100644
--- a/src/app/community-list-page/community-list-datasource.ts
+++ b/src/app/community-list-page/community-list-datasource.ts
@@ -1,7 +1,10 @@
+import { Subscription } from 'rxjs/internal/Subscription';
+import { FindListOptions } from '../core/data/request.models';
+import { hasValue } from '../shared/empty.util';
 import { CommunityListService, FlatNode } from './community-list-service';
 import { CollectionViewer, DataSource } from '@angular/cdk/typings/collections';
 import { BehaviorSubject, Observable, } from 'rxjs';
-import { finalize, take, } from 'rxjs/operators';
+import { finalize } from 'rxjs/operators';
 
 /**
  * DataSource object needed by a CDK Tree to render its nodes.
@@ -13,6 +16,7 @@ export class CommunityListDatasource implements DataSource<FlatNode> {
 
   private communityList$ = new BehaviorSubject<FlatNode[]>([]);
   public loading$ = new BehaviorSubject<boolean>(false);
+  private subLoadCommunities: Subscription;
 
   constructor(private communityListService: CommunityListService) {
   }
@@ -21,11 +25,12 @@ export class CommunityListDatasource implements DataSource<FlatNode> {
     return this.communityList$.asObservable();
   }
 
-  loadCommunities(expandedNodes: FlatNode[]) {
+  loadCommunities(findOptions: FindListOptions, expandedNodes: FlatNode[]) {
     this.loading$.next(true);
-
-    this.communityListService.loadCommunities(expandedNodes).pipe(
-      take(1),
+    if (hasValue(this.subLoadCommunities)) {
+      this.subLoadCommunities.unsubscribe();
+    }
+    this.subLoadCommunities = this.communityListService.loadCommunities(findOptions, expandedNodes).pipe(
       finalize(() => this.loading$.next(false)),
     ).subscribe((flatNodes: FlatNode[]) => {
       this.communityList$.next(flatNodes);
diff --git a/src/app/community-list-page/community-list-page.module.ts b/src/app/community-list-page/community-list-page.module.ts
index 2e3914fe031..57b016bc6ec 100644
--- a/src/app/community-list-page/community-list-page.module.ts
+++ b/src/app/community-list-page/community-list-page.module.ts
@@ -4,7 +4,6 @@ import { SharedModule } from '../shared/shared.module';
 import { CommunityListPageComponent } from './community-list-page.component';
 import { CommunityListPageRoutingModule } from './community-list-page.routing.module';
 import { CommunityListComponent } from './community-list/community-list.component';
-import { CdkTreeModule } from '@angular/cdk/tree';
 
 /**
  * The page which houses a title and the community list, as described in community-list.component
@@ -13,8 +12,7 @@ import { CdkTreeModule } from '@angular/cdk/tree';
   imports: [
     CommonModule,
     SharedModule,
-    CommunityListPageRoutingModule,
-    CdkTreeModule,
+    CommunityListPageRoutingModule
   ],
   declarations: [
     CommunityListPageComponent,
diff --git a/src/app/community-list-page/community-list-service.spec.ts b/src/app/community-list-page/community-list-service.spec.ts
index 6b7ab2bd779..2f3e70baac5 100644
--- a/src/app/community-list-page/community-list-service.spec.ts
+++ b/src/app/community-list-page/community-list-service.spec.ts
@@ -1,21 +1,19 @@
-import { of as observableOf } from 'rxjs';
-import { TestBed, inject, async } from '@angular/core/testing';
+import { inject, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
+import { take } from 'rxjs/operators';
 import { AppState } from '../app.reducer';
+import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
+import { PaginatedList, buildPaginatedList } from '../core/data/paginated-list.model';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { StoreMock } from '../shared/testing/store.mock';
 import { CommunityListService, FlatNode, toFlatNode } from './community-list-service';
 import { CollectionDataService } from '../core/data/collection-data.service';
-import { PaginatedList } from '../core/data/paginated-list';
-import { PageInfo } from '../core/shared/page-info.model';
 import { CommunityDataService } from '../core/data/community-data.service';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject$
-} from '../shared/remote-data.utils';
 import { Community } from '../core/shared/community.model';
 import { Collection } from '../core/shared/collection.model';
-import { take } from 'rxjs/operators';
 import { FindListOptions } from '../core/data/request.models';
+import { PageInfo } from '../core/shared/page-info.model';
 
 describe('CommunityListService', () => {
   let store: StoreMock<AppState>;
@@ -70,28 +68,28 @@ describe('CommunityListService', () => {
       Object.assign(new Community(), {
         id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
         uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
-        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
-        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+        collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
       }),
       Object.assign(new Community(), {
         id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
         uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
-        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
+        subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+        collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
       }),
       Object.assign(new Community(), {
         id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
         uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
-        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+        collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
       }),
     ];
     mockListOfTopCommunitiesPage2 = [
       Object.assign(new Community(), {
         id: 'c2e04392-3b8a-4dfa-976d-d76fb1b8a4b6',
         uuid: 'c2e04392-3b8a-4dfa-976d-d76fb1b8a4b6',
-        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+        collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
       }),
     ];
     mockTopCommunitiesWithChildrenArraysPage1 = [
@@ -139,7 +137,7 @@ describe('CommunityListService', () => {
         if (endPageIndex > allTopComs.length) {
           endPageIndex = allTopComs.length;
         }
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), allTopComs.slice(startPageIndex, endPageIndex)));
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allTopComs.slice(startPageIndex, endPageIndex)));
       },
       findByParent(parentUUID: string, options: FindListOptions = {}) {
         const foundCom = allCommunities.find((community) => (community.id === parentUUID));
@@ -149,7 +147,7 @@ describe('CommunityListService', () => {
           currentPage = 1
         }
         if (elementsPerPage === 0) {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), (foundCom.subcommunities as [Community])));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), (foundCom.subcommunities as [Community])));
         }
         elementsPerPage = standardElementsPerPage;
         if (foundCom !== undefined && foundCom.subcommunities !== undefined) {
@@ -159,7 +157,7 @@ describe('CommunityListService', () => {
           if (endPageIndex > coms.length) {
             endPageIndex = coms.length;
           }
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), coms.slice(startPageIndex, endPageIndex)));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), coms.slice(startPageIndex, endPageIndex)));
         } else {
           return createFailedRemoteDataObject$();
         }
@@ -174,7 +172,7 @@ describe('CommunityListService', () => {
           currentPage = 1
         }
         if (elementsPerPage === 0) {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), (foundCom.collections as [Collection])));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), (foundCom.collections as [Collection])));
         }
         elementsPerPage = standardElementsPerPage;
         if (foundCom !== undefined && foundCom.collections !== undefined) {
@@ -184,7 +182,7 @@ describe('CommunityListService', () => {
           if (endPageIndex > colls.length) {
             endPageIndex = colls.length;
           }
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), colls.slice(startPageIndex, endPageIndex)));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), colls.slice(startPageIndex, endPageIndex)));
         } else {
           return createFailedRemoteDataObject$();
         }
@@ -210,13 +208,18 @@ describe('CommunityListService', () => {
       let flatNodeList;
       describe('None expanded: should return list containing only flatnodes of the test top communities page 1 and 2', () => {
         let findTopSpy;
-        beforeEach(() => {
+        beforeEach((done) => {
           findTopSpy = spyOn(communityDataServiceStub, 'findTop').and.callThrough();
-          service.getNextPageTopCommunities();
 
-          const sub = service.loadCommunities(null)
-            .subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 2,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, null)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('flatnode list should contain just flatnodes of top community list page 1 and 2', () => {
           expect(findTopSpy).toHaveBeenCalled();
@@ -236,10 +239,16 @@ describe('CommunityListService', () => {
     describe('should transform all communities in a list of flatnodes with possible subcoms and collections as subflatnodes if they\'re expanded', () => {
       let flatNodeList;
       describe('None expanded: should return list containing only flatnodes of the test top communities', () => {
-        beforeEach(() => {
-          const sub = service.loadCommunities(null)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+        beforeEach((done) => {
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, null)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length);
@@ -256,7 +265,7 @@ describe('CommunityListService', () => {
         });
       });
       describe('All top expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-        beforeEach(() => {
+        beforeEach((done) => {
           const expandedNodes = [];
           mockListOfTopCommunitiesPage1.map((community: Community) => {
             const communityFlatNode = toFlatNode(community, observableOf(true), 0, true, null);
@@ -264,9 +273,15 @@ describe('CommunityListService', () => {
             communityFlatNode.currentCommunityPage = 1;
             expandedNodes.push(communityFlatNode);
           });
-          const sub = service.loadCommunities(expandedNodes)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, expandedNodes)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list and size of its possible page-limited children', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockSubcommunities1Page1.length + mockSubcommunities1Page1.length);
@@ -281,14 +296,20 @@ describe('CommunityListService', () => {
         });
       });
       describe('Just first top comm expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-        beforeEach(() => {
+        beforeEach((done) => {
           const communityFlatNode = toFlatNode(mockListOfTopCommunitiesPage1[0], observableOf(true), 0, true, null);
           communityFlatNode.currentCollectionPage = 1;
           communityFlatNode.currentCommunityPage = 1;
           const expandedNodes = [communityFlatNode];
-          const sub = service.loadCommunities(expandedNodes)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, expandedNodes)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list and size of page-limited children of first top community', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockSubcommunities1Page1.length);
@@ -300,14 +321,20 @@ describe('CommunityListService', () => {
         });
       });
       describe('Just second top comm expanded, collections at page 2: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-        beforeEach(() => {
+        beforeEach((done) => {
           const communityFlatNode = toFlatNode(mockListOfTopCommunitiesPage1[1], observableOf(true), 0, true, null);
           communityFlatNode.currentCollectionPage = 2;
           communityFlatNode.currentCommunityPage = 1;
           const expandedNodes = [communityFlatNode];
-          const sub = service.loadCommunities(expandedNodes)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, expandedNodes)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list and size of page-limited children of second top community', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockCollectionsPage1.length + mockCollectionsPage2.length);
@@ -333,10 +360,13 @@ describe('CommunityListService', () => {
         });
         let flatNodeList;
         describe('None expanded: should return list containing only flatnodes of the communities in the test list', () => {
-          beforeEach(() => {
-            const sub = service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, null)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+          beforeEach((done) => {
+            service.transformListOfCommunities(buildPaginatedList(new PageInfo(), listOfCommunities), 0, null, null)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('length of flatnode list should be as big as community test list', () => {
             expect(flatNodeList.length).toEqual(listOfCommunities.length);
@@ -353,7 +383,7 @@ describe('CommunityListService', () => {
           });
         });
         describe('All top expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-          beforeEach(() => {
+          beforeEach((done) => {
             const expandedNodes = [];
             listOfCommunities.map((community: Community) => {
               const communityFlatNode = toFlatNode(community, observableOf(true), 0, true, null);
@@ -361,9 +391,12 @@ describe('CommunityListService', () => {
               communityFlatNode.currentCommunityPage = 1;
               expandedNodes.push(communityFlatNode);
             });
-            const sub = service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, expandedNodes)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+            service.transformListOfCommunities(buildPaginatedList(new PageInfo(), listOfCommunities), 0, null, expandedNodes)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('length of flatnode list should be as big as community test list and size of its possible children', () => {
             expect(flatNodeList.length).toEqual(listOfCommunities.length + mockSubcommunities1Page1.length + mockSubcommunities1Page1.length);
@@ -388,8 +421,8 @@ describe('CommunityListService', () => {
         const communityWithNoSubcomsOrColls = Object.assign(new Community(), {
           id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
           uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
-          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+          collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
             'dc.title': [{ language: 'en_US', value: 'Community 2' }]
@@ -397,10 +430,13 @@ describe('CommunityListService', () => {
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
-          beforeEach(() => {
-            const sub = service.transformCommunity(communityWithNoSubcomsOrColls, 0, null, null)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+          beforeEach((done) => {
+            service.transformCommunity(communityWithNoSubcomsOrColls, 0, null, null)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('length of flatnode list should be 1', () => {
             expect(flatNodeList.length).toEqual(1);
@@ -417,8 +453,8 @@ describe('CommunityListService', () => {
         const communityWithSubcoms = Object.assign(new Community(), {
           id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
           uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
-          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
-          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+          collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
             'dc.title': [{ language: 'en_US', value: 'Community 1' }]
@@ -426,10 +462,14 @@ describe('CommunityListService', () => {
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
-          beforeAll(() => {
-            const sub = service.transformCommunity(communityWithSubcoms, 0, null, null)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+          beforeEach((done) => {
+            service.transformCommunity(communityWithSubcoms, 0, null, null)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
+
           });
           it('length of flatnode list should be 1', () => {
             expect(flatNodeList.length).toEqual(1);
@@ -447,22 +487,25 @@ describe('CommunityListService', () => {
           const communityWithSubcoms = Object.assign(new Community(), {
             id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
             uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
-            subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
-            collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+            subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+            collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
             metadata: {
               'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
               'dc.title': [{ language: 'en_US', value: 'Community 1' }]
             }
           });
           let flatNodeList;
-          beforeEach(() => {
+          beforeEach((done) => {
             const communityFlatNode = toFlatNode(communityWithSubcoms, observableOf(true), 0, true, null);
             communityFlatNode.currentCollectionPage = 1;
             communityFlatNode.currentCommunityPage = 1;
             const expandedNodes = [communityFlatNode];
-            const sub = service.transformCommunity(communityWithSubcoms, 0, null, expandedNodes)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+            service.transformCommunity(communityWithSubcoms, 0, null, expandedNodes)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('list of flatnodes is length is  1 + nrOfSubcoms & first flatnode is of expanded test community', () => {
             expect(flatNodeList.length).toEqual(1 + mockSubcommunities1Page1.length);
@@ -485,12 +528,12 @@ describe('CommunityListService', () => {
         describe('should return list containing flatnodes of that community, its collections of the first two pages', () => {
           let communityWithCollections;
           let flatNodeList;
-          beforeEach(() => {
+          beforeEach((done) => {
             communityWithCollections = Object.assign(new Community(), {
               id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
               uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
-              subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-              collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
+              subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+              collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
               metadata: {
                 'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
                 'dc.title': [{ language: 'en_US', value: 'Community 1' }]
@@ -500,9 +543,12 @@ describe('CommunityListService', () => {
             communityFlatNode.currentCollectionPage = 2;
             communityFlatNode.currentCommunityPage = 1;
             const expandedNodes = [communityFlatNode];
-            const sub = service.transformCommunity(communityWithCollections, 0, null, expandedNodes)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+            service.transformCommunity(communityWithCollections, 0, null, expandedNodes)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('list of flatnodes is length is  1 + nrOfCollections & first flatnode is of expanded test community', () => {
             expect(flatNodeList.length).toEqual(1 + mockCollectionsPage1.length + mockCollectionsPage2.length);
@@ -533,12 +579,12 @@ describe('CommunityListService', () => {
 
   describe('getIsExpandable', () => {
     describe('should return true', () => {
-      it('if community has subcommunities', () => {
+      it('if community has subcommunities', (done) => {
         const communityWithSubcoms = Object.assign(new Community(), {
           id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
           uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
-          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
-          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+          collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
             'dc.title': [{ language: 'en_US', value: 'Community 1' }]
@@ -546,14 +592,15 @@ describe('CommunityListService', () => {
         });
         service.getIsExpandable(communityWithSubcoms).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
+          done();
         });
       });
-      it('if community has collections', () => {
+      it('if community has collections', (done) => {
         const communityWithCollections = Object.assign(new Community(), {
           id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
           uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
-          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockCollectionsPage1)),
+          subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+          collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockCollectionsPage1)),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
             'dc.title': [{ language: 'en_US', value: 'Community 2' }]
@@ -561,16 +608,17 @@ describe('CommunityListService', () => {
         });
         service.getIsExpandable(communityWithCollections).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
+          done();
         });
       });
     });
     describe('should return false', () => {
-      it('if community has neither subcommunities nor collections', () => {
+      it('if community has neither subcommunities nor collections', (done) => {
         const communityWithNoSubcomsOrColls = Object.assign(new Community(), {
           id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
           uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
-          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+          collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, no coll' }],
             'dc.title': [{ language: 'en_US', value: 'Community 3' }]
@@ -578,6 +626,7 @@ describe('CommunityListService', () => {
         });
         service.getIsExpandable(communityWithNoSubcomsOrColls).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(false);
+          done();
         });
       });
     });
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index be04887e713..95ca34f31b5 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -2,21 +2,22 @@ import { Injectable } from '@angular/core';
 import { createSelector, Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
 import { Observable, of as observableOf } from 'rxjs';
+import { map, switchMap, filter } from 'rxjs/operators';
 import { AppState } from '../app.reducer';
 import { CommunityDataService } from '../core/data/community-data.service';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { catchError, filter, map, switchMap, take } from 'rxjs/operators';
+import { FindListOptions } from '../core/data/request.models';
 import { Community } from '../core/shared/community.model';
 import { Collection } from '../core/shared/collection.model';
+import { PageInfo } from '../core/shared/page-info.model';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
-import { PaginatedList } from '../core/data/paginated-list';
-import { getCommunityPageRoute } from '../+community-page/community-page-routing.module';
-import { getCollectionPageRoute } from '../+collection-page/collection-page-routing.module';
+import { PaginatedList, buildPaginatedList } from '../core/data/paginated-list.model';
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { CommunityListSaveAction } from './community-list.actions';
 import { CommunityListState } from './community-list.reducer';
+import { getCommunityPageRoute } from '../+community-page/community-page-routing-paths';
+import { getCollectionPageRoute } from '../+collection-page/collection-page-routing-paths';
+import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
  * Each node in the tree is represented by a flatNode which contains info about the node itself and its position and
@@ -46,8 +47,8 @@ export class ShowMoreFlatNode {
 // Helper method to combine an flatten an array of observables of flatNode arrays
 export const combineAndFlatten = (obsList: Array<Observable<FlatNode[]>>): Observable<FlatNode[]> =>
   observableCombineLatest(...obsList).pipe(
-    map((matrix: FlatNode[][]) =>
-      matrix.reduce((combinedList, currentList: FlatNode[]) => [...combinedList, ...currentList]))
+    map((matrix: any[][]) => [].concat(...matrix)),
+    filter((arr: any[]) => arr.every((e) => hasValue(e))),
   );
 
 /**
@@ -99,6 +100,8 @@ const communityListStateSelector = (state: AppState) => state.communityList;
 const expandedNodesSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.expandedNodes);
 const loadingNodeSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.loadingNode);
 
+export const MAX_COMCOLS_PER_PAGE = 50;
+
 /**
  * Service class for the community list, responsible for the creating of the flat list used by communityList dataSource
  *  and connection to the store to retrieve and save the state of the community list
@@ -107,26 +110,8 @@ const loadingNodeSelector = createSelector(communityListStateSelector, (communit
 @Injectable()
 export class CommunityListService {
 
-  // page-limited list of top-level communities
-  payloads$: Array<Observable<PaginatedList<Community>>>;
-
-  topCommunitiesConfig: PaginationComponentOptions;
-  topCommunitiesSortConfig: SortOptions;
-
-  maxSubCommunitiesPerPage: number;
-  maxCollectionsPerPage: number;
-
   constructor(private communityDataService: CommunityDataService, private collectionDataService: CollectionDataService,
               private store: Store<any>) {
-    this.topCommunitiesConfig = new PaginationComponentOptions();
-    this.topCommunitiesConfig.id = 'top-level-pagination';
-    this.topCommunitiesConfig.pageSize = 10;
-    this.topCommunitiesConfig.currentPage = 1;
-    this.topCommunitiesSortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    this.initTopCommunityList();
-
-    this.maxSubCommunitiesPerPage = 3;
-    this.maxCollectionsPerPage = 3;
   }
 
   saveCommunityListStateToStore(expandedNodes: FlatNode[], loadingNode: FlatNode): void {
@@ -141,57 +126,50 @@ export class CommunityListService {
     return this.store.select(loadingNodeSelector);
   }
 
-  /**
-   * Increases the payload so it contains the next page of top level communities
-   */
-  getNextPageTopCommunities(): void {
-    this.topCommunitiesConfig.currentPage = this.topCommunitiesConfig.currentPage + 1;
-    this.payloads$ = [...this.payloads$, this.communityDataService.findTop({
-      currentPage: this.topCommunitiesConfig.currentPage,
-      elementsPerPage: this.topCommunitiesConfig.pageSize,
-      sort: {
-        field: this.topCommunitiesSortConfig.field,
-        direction: this.topCommunitiesSortConfig.direction
-      }
-    }).pipe(
-      take(1),
-      map((results) => results.payload),
-    )];
-  }
-
   /**
    * Gets all top communities, limited by page, and transforms this in a list of flatNodes.
    * @param expandedNodes     List of expanded nodes; if a node is not expanded its subCommunities and collections need
    *                            not be added to the list
    */
-  loadCommunities(expandedNodes: FlatNode[]): Observable<FlatNode[]> {
-    const res = this.payloads$.map((payload) => {
-      return payload.pipe(
-        take(1),
-        switchMap((result: PaginatedList<Community>) => {
-          return this.transformListOfCommunities(result, 0, null, expandedNodes);
-        }),
-        catchError(() => observableOf([])),
-      );
-    });
-    return combineAndFlatten(res);
+  loadCommunities(findOptions: FindListOptions, expandedNodes: FlatNode[]): Observable<FlatNode[]> {
+    const currentPage = findOptions.currentPage;
+    const topCommunities = [];
+    for (let i = 1; i <= currentPage; i++) {
+      const pagination: FindListOptions = Object.assign({}, findOptions, { currentPage: i });
+      topCommunities.push(this.getTopCommunities(pagination));
+    }
+    const topComs$ = observableCombineLatest(...topCommunities).pipe(
+      map((coms: Array<PaginatedList<Community>>) => {
+        const newPages: Community[][] = coms.map((unit: PaginatedList<Community>) => unit.page);
+        const newPage: Community[] = [].concat(...newPages);
+        let newPageInfo = new PageInfo();
+        if (coms && coms.length > 0) {
+          newPageInfo = Object.assign({}, coms[0].pageInfo, { currentPage })
+        }
+        return buildPaginatedList(newPageInfo, newPage);
+      })
+    );
+    return topComs$.pipe(
+      switchMap((topComs: PaginatedList<Community>) => this.transformListOfCommunities(topComs, 0, null, expandedNodes)),
+      // distinctUntilChanged((a: FlatNode[], b: FlatNode[]) => a.length === b.length)
+    );
   };
 
   /**
    * Puts the initial top level communities in a list to be called upon
    */
-  private initTopCommunityList(): void {
-    this.payloads$ = [this.communityDataService.findTop({
-      currentPage: this.topCommunitiesConfig.currentPage,
-      elementsPerPage: this.topCommunitiesConfig.pageSize,
+  private getTopCommunities(options: FindListOptions): Observable<PaginatedList<Community>> {
+    return this.communityDataService.findTop({
+      currentPage: options.currentPage,
+      elementsPerPage: MAX_COMCOLS_PER_PAGE,
       sort: {
-        field: this.topCommunitiesSortConfig.field,
-        direction: this.topCommunitiesSortConfig.direction
+        field: options.sort.field,
+        direction: options.sort.direction
       }
     }).pipe(
-      take(1),
+      getFirstSucceededRemoteData(),
       map((results) => results.payload),
-    )];
+    );
   }
 
   /**
@@ -206,16 +184,15 @@ export class CommunityListService {
                                     parent: FlatNode,
                                     expandedNodes: FlatNode[]): Observable<FlatNode[]> {
     if (isNotEmpty(listOfPaginatedCommunities.page)) {
-      let currentPage = this.topCommunitiesConfig.currentPage;
+      let currentPage = listOfPaginatedCommunities.currentPage;
       if (isNotEmpty(parent)) {
         currentPage = expandedNodes.find((node: FlatNode) => node.id === parent.id).currentCommunityPage;
       }
-      const isNotAllCommunities = (listOfPaginatedCommunities.totalElements > (listOfPaginatedCommunities.elementsPerPage * currentPage));
       let obsList = listOfPaginatedCommunities.page
         .map((community: Community) => {
           return this.transformCommunity(community, level, parent, expandedNodes)
         });
-      if (isNotAllCommunities && listOfPaginatedCommunities.currentPage > currentPage) {
+      if (currentPage < listOfPaginatedCommunities.totalPages && currentPage === listOfPaginatedCommunities.currentPage) {
         obsList = [...obsList, observableOf([showMoreFlatNode('community', level, parent)])];
       }
 
@@ -252,14 +229,18 @@ export class CommunityListService {
       let subcoms = [];
       for (let i = 1; i <= currentCommunityPage; i++) {
         const nextSetOfSubcommunitiesPage = this.communityDataService.findByParent(community.uuid, {
-          elementsPerPage: this.maxSubCommunitiesPerPage,
+          elementsPerPage: MAX_COMCOLS_PER_PAGE,
           currentPage: i
         })
           .pipe(
-            filter((rd: RemoteData<PaginatedList<Community>>) => rd.hasSucceeded),
-            take(1),
-            switchMap((rd: RemoteData<PaginatedList<Community>>) =>
-              this.transformListOfCommunities(rd.payload, level + 1, communityFlatNode, expandedNodes))
+            getFirstCompletedRemoteData(),
+            switchMap((rd: RemoteData<PaginatedList<Community>>) => {
+              if (hasValue(rd) && hasValue(rd.payload)) {
+                return this.transformListOfCommunities(rd.payload, level + 1, communityFlatNode, expandedNodes);
+              } else {
+                return observableOf([]);
+              }
+            })
           );
 
         subcoms = [...subcoms, nextSetOfSubcommunitiesPage];
@@ -271,19 +252,22 @@ export class CommunityListService {
       let collections = [];
       for (let i = 1; i <= currentCollectionPage; i++) {
         const nextSetOfCollectionsPage = this.collectionDataService.findByParent(community.uuid, {
-          elementsPerPage: this.maxCollectionsPerPage,
+          elementsPerPage: MAX_COMCOLS_PER_PAGE,
           currentPage: i
         })
           .pipe(
-            filter((rd: RemoteData<PaginatedList<Collection>>) => rd.hasSucceeded),
-            take(1),
+            getFirstCompletedRemoteData(),
             map((rd: RemoteData<PaginatedList<Collection>>) => {
-              let nodes = rd.payload.page
-                .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode));
-              if ((rd.payload.elementsPerPage * currentCollectionPage) < rd.payload.totalElements && rd.payload.currentPage > currentCollectionPage) {
-                nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)];
+              if (hasValue(rd) && hasValue(rd.payload)) {
+                let nodes = rd.payload.page
+                  .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode));
+                if (currentCollectionPage < rd.payload.totalPages && currentCollectionPage === rd.payload.currentPage) {
+                  nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)];
+                }
+                return nodes;
+              } else {
+                return [];
               }
-              return nodes;
             }),
           );
         collections = [...collections, nextSetOfCollectionsPage];
@@ -305,21 +289,28 @@ export class CommunityListService {
     let hasColls$: Observable<boolean>;
     hasSubcoms$ = this.communityDataService.findByParent(community.uuid, { elementsPerPage: 1 })
       .pipe(
-        filter((rd: RemoteData<PaginatedList<Community>>) => rd.hasSucceeded),
-        take(1),
-        map((results) => results.payload.totalElements > 0),
+        map((rd: RemoteData<PaginatedList<Community>>) => {
+          if (hasValue(rd) && hasValue(rd.payload)) {
+            return rd.payload.totalElements > 0;
+          } else {
+            return false;
+          }
+        }),
       );
 
     hasColls$ = this.collectionDataService.findByParent(community.uuid, { elementsPerPage: 1 })
       .pipe(
-        filter((rd: RemoteData<PaginatedList<Collection>>) => rd.hasSucceeded),
-        take(1),
-        map((results) => results.payload.totalElements > 0),
+        map((rd: RemoteData<PaginatedList<Collection>>) => {
+          if (hasValue(rd) && hasValue(rd.payload)) {
+            return rd.payload.totalElements > 0;
+          } else {
+            return false;
+          }
+        }),
       );
 
     let hasChildren$: Observable<boolean>;
     hasChildren$ = observableCombineLatest(hasSubcoms$, hasColls$).pipe(
-      take(1),
       map(([hasSubcoms, hasColls]: [boolean, boolean]) => {
         if (hasSubcoms || hasColls) {
           return true;
diff --git a/src/app/community-list-page/community-list.reducer.spec.ts b/src/app/community-list-page/community-list.reducer.spec.ts
index 23999e61667..65065185f93 100644
--- a/src/app/community-list-page/community-list.reducer.spec.ts
+++ b/src/app/community-list-page/community-list.reducer.spec.ts
@@ -1,5 +1,5 @@
 import { of as observableOf } from 'rxjs/internal/observable/of';
-import { PaginatedList } from '../core/data/paginated-list';
+import { buildPaginatedList } from '../core/data/paginated-list.model';
 import { Community } from '../core/shared/community.model';
 import { PageInfo } from '../core/shared/page-info.model';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
@@ -17,8 +17,8 @@ describe('communityListReducer', () => {
     Object.assign(new Community(), {
       id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
       uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
-      subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
-      collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+      subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+      collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
       name: 'community1',
     }), observableOf(true), 0, false, null
   );
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index c179715bf15..ab28baaa367 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,5 +1,4 @@
-<ds-loading *ngIf="(dataSource.loading$ | async) && loadingNode === undefined " class="ds-loading"></ds-loading>
-
+<ds-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-loading"></ds-loading>
 <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
   <!-- This is the tree node template for show more node -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
@@ -28,7 +27,7 @@
       <button type="button" class="btn btn-default" cdkTreeNodeToggle
               [attr.aria-label]="'toggle ' + node.name"
               (click)="toggleExpanded(node)"
-              [ngClass]="(node.isExpandable$ | async) ? 'visible' : 'invisible'">
+              [ngClass]="(hasChild(null, node)| async) ? 'visible' : 'invisible'">
         <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
               aria-hidden="true"></span>
       </button>
diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts
index a91c5fa057c..aea510795e0 100644
--- a/src/app/community-list-page/community-list/community-list.component.spec.ts
+++ b/src/app/community-list-page/community-list/community-list.component.spec.ts
@@ -14,7 +14,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Community } from '../../core/shared/community.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { Collection } from '../../core/shared/collection.model';
 import { of as observableOf } from 'rxjs';
@@ -86,8 +86,8 @@ describe('CommunityListComponent', () => {
       Object.assign(new Community(), {
         id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
         uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
-        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
-        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+        collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         name: 'community1',
       }), observableOf(true), 0, false, null
     ),
@@ -95,8 +95,8 @@ describe('CommunityListComponent', () => {
       Object.assign(new Community(), {
         id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
         uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
-        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
+        subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+        collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
         name: 'community2',
       }), observableOf(true), 0, false, null
     ),
@@ -104,8 +104,8 @@ describe('CommunityListComponent', () => {
       Object.assign(new Community(), {
         id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
         uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
-        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
-        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+        collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         name: 'community3',
       }), observableOf(false), 0, false, null
     ),
@@ -114,15 +114,9 @@ describe('CommunityListComponent', () => {
 
   beforeEach(async(() => {
     communityListServiceStub = {
-      topPageSize: 2,
-      topCurrentPage: 1,
-      collectionPageSize: 2,
-      subcommunityPageSize: 2,
+      pageSize: 2,
       expandedNodes: [],
       loadingNode: null,
-      getNextPageTopCommunities() {
-        this.topCurrentPage++;
-      },
       getLoadingNodeFromStore() {
         return observableOf(this.loadingNode);
       },
@@ -133,12 +127,12 @@ describe('CommunityListComponent', () => {
         this.expandedNodes = expandedNodes;
         this.loadingNode = loadingNode;
       },
-      loadCommunities(expandedNodes) {
+      loadCommunities(options, expandedNodes) {
         let flatnodes;
         let showMoreTopComNode = false;
         flatnodes = [...mockTopFlatnodesUnexpanded];
-        const currentPage = this.topCurrentPage;
-        const elementsPerPage = this.topPageSize;
+        const currentPage = options.currentPage;
+        const elementsPerPage = this.pageSize;
         let endPageIndex = (currentPage * elementsPerPage);
         if (endPageIndex >= flatnodes.length) {
           endPageIndex = flatnodes.length;
@@ -171,14 +165,14 @@ describe('CommunityListComponent', () => {
                   collFlatnodes = [...collFlatnodes, toFlatNode(coll, observableOf(false), topNode.level + 1, false, topNode)];
                 });
                 if (isNotEmpty(subComFlatnodes)) {
-                  const endSubComIndex = this.subcommunityPageSize * expandedParent.currentCommunityPage;
+                  const endSubComIndex = this.pageSize * expandedParent.currentCommunityPage;
                   flatnodes = [...flatnodes, ...subComFlatnodes.slice(0, endSubComIndex)];
                   if (subComFlatnodes.length > endSubComIndex) {
                     flatnodes = [...flatnodes, showMoreFlatNode('community', topNode.level + 1, expandedParent)];
                   }
                 }
                 if (isNotEmpty(collFlatnodes)) {
-                  const endColIndex = this.collectionPageSize * expandedParent.currentCollectionPage;
+                  const endColIndex = this.pageSize * expandedParent.currentCollectionPage;
                   flatnodes = [...flatnodes, ...collFlatnodes.slice(0, endColIndex)];
                   if (collFlatnodes.length > endColIndex) {
                     flatnodes = [...flatnodes, showMoreFlatNode('collection', topNode.level + 1, expandedParent)];
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index ddcd49cd1cc..49065c5ec5b 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { take } from 'rxjs/operators';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/request.models';
 import { CommunityListService, FlatNode } from '../community-list-service';
 import { CommunityListDatasource } from '../community-list-datasource';
 import { FlatTreeControl } from '@angular/cdk/tree';
@@ -22,12 +24,18 @@ export class CommunityListComponent implements OnInit, OnDestroy {
   public loadingNode: FlatNode;
 
   treeControl = new FlatTreeControl<FlatNode>(
-    (node) => node.level, (node) => true
+    (node: FlatNode) => node.level, (node: FlatNode) => true
   );
 
   dataSource: CommunityListDatasource;
 
+  paginationConfig: FindListOptions;
+
   constructor(private communityListService: CommunityListService) {
+    this.paginationConfig = new FindListOptions();
+    this.paginationConfig.elementsPerPage = 2;
+    this.paginationConfig.currentPage = 1;
+    this.paginationConfig.sort = new SortOptions('dc.title', SortDirection.ASC);
   }
 
   ngOnInit() {
@@ -37,7 +45,7 @@ export class CommunityListComponent implements OnInit, OnDestroy {
     });
     this.communityListService.getExpandedNodesFromStore().pipe(take(1)).subscribe((result) => {
       this.expandedNodes = [...result];
-      this.dataSource.loadCommunities(this.expandedNodes);
+      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     });
   }
 
@@ -56,7 +64,7 @@ export class CommunityListComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Toggles the expanded variable of a node, adds it to the exapanded nodes list and reloads the tree so this node is expanded
+   * Toggles the expanded variable of a node, adds it to the expanded nodes list and reloads the tree so this node is expanded
    * @param node  Node we want to expand
    */
   toggleExpanded(node: FlatNode) {
@@ -74,7 +82,7 @@ export class CommunityListComponent implements OnInit, OnDestroy {
         node.currentCommunityPage = 1;
       }
     }
-    this.dataSource.loadCommunities(this.expandedNodes);
+    this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
   }
 
   /**
@@ -94,10 +102,10 @@ export class CommunityListComponent implements OnInit, OnDestroy {
         const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
         parentNodeInExpandedNodes.currentCommunityPage++;
       }
-      this.dataSource.loadCommunities(this.expandedNodes);
+      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     } else {
-      this.communityListService.getNextPageTopCommunities();
-      this.dataSource.loadCommunities(this.expandedNodes);
+      this.paginationConfig.currentPage++;
+      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     }
   }
 
diff --git a/src/app/core/auth/auth-blocking.guard.spec.ts b/src/app/core/auth/auth-blocking.guard.spec.ts
new file mode 100644
index 00000000000..2a89b01a855
--- /dev/null
+++ b/src/app/core/auth/auth-blocking.guard.spec.ts
@@ -0,0 +1,62 @@
+import { Store } from '@ngrx/store';
+import * as ngrx from '@ngrx/store';
+import { cold, getTestScheduler, initTestScheduler, resetTestScheduler } from 'jasmine-marbles/es6';
+import { of as observableOf } from 'rxjs';
+import { AppState } from '../../app.reducer';
+import { AuthBlockingGuard } from './auth-blocking.guard';
+
+describe('AuthBlockingGuard', () => {
+  let guard: AuthBlockingGuard;
+  beforeEach(() => {
+    guard = new AuthBlockingGuard(new Store<AppState>(undefined, undefined, undefined));
+    initTestScheduler();
+  });
+
+  afterEach(() => {
+    getTestScheduler().flush();
+    resetTestScheduler();
+  });
+
+  describe(`canActivate`, () => {
+
+    describe(`when authState.loading is undefined`, () => {
+      beforeEach(() => {
+        spyOnProperty(ngrx, 'select').and.callFake(() => {
+          return () => {
+            return () => observableOf(undefined);
+          };
+        })
+      });
+      it(`should not emit anything`, () => {
+        expect(guard.canActivate()).toBeObservable(cold('|'));
+      });
+    });
+
+    describe(`when authState.loading is true`, () => {
+      beforeEach(() => {
+        spyOnProperty(ngrx, 'select').and.callFake(() => {
+          return () => {
+            return () => observableOf(true);
+          };
+        })
+      });
+      it(`should not emit anything`, () => {
+        expect(guard.canActivate()).toBeObservable(cold('|'));
+      });
+    });
+
+    describe(`when authState.loading is false`, () => {
+      beforeEach(() => {
+        spyOnProperty(ngrx, 'select').and.callFake(() => {
+          return () => {
+            return () => observableOf(false);
+          };
+        })
+      });
+      it(`should succeed`, () => {
+        expect(guard.canActivate()).toBeObservable(cold('(a|)', { a: true }));
+      });
+    });
+  });
+
+});
diff --git a/src/app/core/auth/auth-blocking.guard.ts b/src/app/core/auth/auth-blocking.guard.ts
new file mode 100644
index 00000000000..9054f66f8b1
--- /dev/null
+++ b/src/app/core/auth/auth-blocking.guard.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import { CanActivate } from '@angular/router';
+import { select, Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import { AppState } from '../../app.reducer';
+import { isAuthenticationBlocking } from './selectors';
+
+/**
+ * A guard that blocks the loading of any
+ * route until the authentication status has loaded.
+ * To ensure all rest requests get the correct auth header.
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class AuthBlockingGuard implements CanActivate {
+
+  constructor(private store: Store<AppState>) {
+  }
+
+  /**
+   * True when the authentication isn't blocking everything
+   */
+  canActivate(): Observable<boolean> {
+    return this.store.pipe(select(isAuthenticationBlocking)).pipe(
+      map((isBlocking: boolean) => isBlocking === false),
+      distinctUntilChanged(),
+      filter((finished: boolean) => finished === true),
+      take(1),
+    );
+  }
+
+}
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 465fb69dd21..18111340f43 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -1,36 +1,37 @@
-import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
-import { Inject, Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
-import { GlobalConfig } from '../../../config/global-config.interface';
 import { isNotEmpty } from '../../shared/empty.util';
-import { AuthGetRequest, AuthPostRequest, GetRequest, PostRequest, RestRequest } from '../data/request.models';
-import { AuthStatusResponse, ErrorResponse } from '../cache/response.models';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { getResponseFromEntry } from '../shared/operators';
-import { HttpClient } from '@angular/common/http';
+import {
+  GetRequest,
+  PostRequest,
+  RestRequest,
+} from '../data/request.models';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RemoteData } from '../data/remote-data';
+import { AuthStatus } from './models/auth-status.model';
+import { ShortLivedToken } from './models/short-lived-token.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 @Injectable()
 export class AuthRequestService {
   protected linkName = 'authn';
   protected browseEndpoint = '';
+  protected shortlivedtokensEndpoint = 'shortlivedtokens';
 
   constructor(protected halService: HALEndpointService,
               protected requestService: RequestService,
-              private http: HttpClient) {
+              private rdbService: RemoteDataBuildService
+              ) {
   }
 
-  protected fetchRequest(request: RestRequest): Observable<any> {
-    return this.requestService.getByUUID(request.uuid).pipe(
-      getResponseFromEntry(),
-      mergeMap((response) => {
-        if (response.isSuccessful && isNotEmpty(response)) {
-          return observableOf((response as AuthStatusResponse).response);
-        } else if (!response.isSuccessful) {
-          return observableThrowError(new Error((response as ErrorResponse).errorMessage));
-        }
-      })
+  protected fetchRequest(request: RestRequest): Observable<RemoteData<AuthStatus>> {
+    return this.rdbService.buildFromRequestUUID<AuthStatus>(request.uuid).pipe(
+      getFirstCompletedRemoteData(),
     );
   }
 
@@ -38,12 +39,12 @@ export class AuthRequestService {
     return isNotEmpty(method) ? `${endpoint}/${method}` : `${endpoint}`;
   }
 
-  public postToEndpoint(method: string, body?: any, options?: HttpOptions): Observable<any> {
+  public postToEndpoint(method: string, body?: any, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
     return this.halService.getEndpoint(this.linkName).pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
-      map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
+      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
       map ((request: PostRequest) => {
         request.responseMsToLive = 10 * 1000;
         return request;
@@ -53,18 +54,40 @@ export class AuthRequestService {
       distinctUntilChanged());
   }
 
-  public getRequest(method: string, options?: HttpOptions): Observable<any> {
+  public getRequest(method: string, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
     return this.halService.getEndpoint(this.linkName).pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
-      map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)),
+      map((endpointURL: string) => new GetRequest(this.requestService.generateRequestId(), endpointURL, undefined, options)),
       map ((request: GetRequest) => {
-        request.responseMsToLive = 10 * 1000;
+        request.forceBypassCache = true;
         return request;
       }),
       tap((request: GetRequest) => this.requestService.configure(request)),
       mergeMap((request: GetRequest) => this.fetchRequest(request)),
       distinctUntilChanged());
   }
+
+  /**
+   * Send a POST request to retrieve a short-lived token which provides download access of restricted files
+   */
+  public getShortlivedToken(): Observable<string> {
+    return this.halService.getEndpoint(this.linkName).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      distinctUntilChanged(),
+      map((href: string) => new URLCombiner(href, this.shortlivedtokensEndpoint).toString()),
+      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL)),
+      tap((request: PostRequest) => this.requestService.configure(request)),
+      switchMap((request: PostRequest) => this.rdbService.buildFromRequestUUID<ShortLivedToken>(request.uuid)),
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<ShortLivedToken>) => {
+        if (response.hasSucceeded) {
+          return response.payload.value;
+        } else {
+          return null;
+        }
+      })
+    );
+  }
 }
diff --git a/src/app/core/auth/auth-response-parsing.service.spec.ts b/src/app/core/auth/auth-response-parsing.service.spec.ts
deleted file mode 100644
index 924c60535d4..00000000000
--- a/src/app/core/auth/auth-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { async, TestBed } from '@angular/core/testing';
-
-import { Store, StoreModule } from '@ngrx/store';
-
-import { GlobalConfig } from '../../../config/global-config.interface';
-import { StoreMock } from '../../shared/testing/store.mock';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { AuthStatusResponse } from '../cache/response.models';
-import { AuthGetRequest, AuthPostRequest } from '../data/request.models';
-import { AuthResponseParsingService } from './auth-response-parsing.service';
-import { AuthStatus } from './models/auth-status.model';
-import { storeModuleConfig } from '../../app.reducer';
-
-describe('AuthResponseParsingService', () => {
-  let service: AuthResponseParsingService;
-  let linkServiceStub: any;
-
-  const EnvConfig: GlobalConfig = { cache: { msToLive: 1000 } } as any;
-  let store: any;
-  let objectCacheService: ObjectCacheService;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({}, storeModuleConfig),
-      ],
-      providers: [
-        { provide: Store, useClass: StoreMock }
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    store = TestBed.get(Store);
-    linkServiceStub = jasmine.createSpyObj({
-      removeResolvedLinks: {}
-    });
-    objectCacheService = new ObjectCacheService(store as any, linkServiceStub);
-    service = new AuthResponseParsingService(objectCacheService);
-  });
-
-  describe('parse', () => {
-    let validRequest;
-    let validRequest2;
-    let validResponse;
-    let validResponse1;
-    let validResponse2;
-    beforeEach(() => {
-
-      validRequest = new AuthPostRequest(
-        '69f375b5-19f4-4453-8c7a-7dc5c55aafbb',
-        'https://rest.api/dspace-spring-rest/api/authn/login',
-        'password=test&user=myself@testshib.org');
-
-      validRequest2 = new AuthGetRequest(
-        '69f375b5-19f4-4453-8c7a-7dc5c55aafbb',
-        'https://rest.api/dspace-spring-rest/api/authn/status');
-
-      validResponse = {
-        payload: {
-          authenticated: true,
-          id: null,
-          okay: true,
-          token: {
-            accessToken: 'eyJhbGciOiJIUzI1NiJ9.eyJlaWQiOiI0ZGM3MGFiNS1jZDczLTQ5MmYtYjAwNy0zMTc5ZDJkOTI5NmIiLCJzZyI6W10sImV4cCI6MTUyNjMxODMyMn0.ASmvcbJFBfzhN7D5ncloWnaVZr5dLtgTuOgHaCKiimc',
-            expires: 1526318322000
-          },
-        } as AuthStatus,
-        statusCode: 200,
-        statusText: '200'
-      };
-
-      validResponse1 = {
-        payload: {},
-        statusCode: 404,
-        statusText: '404'
-      };
-
-      validResponse2 = {
-        payload: {
-          authenticated: true,
-          id: null,
-          okay: true,
-          type: 'status',
-          _embedded: {
-            eperson: {
-              canLogIn: true,
-              email: 'myself@testshib.org',
-              groups: [],
-              handle: null,
-              id: '4dc70ab5-cd73-492f-b007-3179d2d9296b',
-              lastActive: '2018-05-14T17:03:31.277+0000',
-              metadata: {
-                'eperson.firstname': [
-                  {
-                    language: null,
-                    value: 'User'
-                  }
-                ],
-                'eperson.lastname': [
-                  {
-                    language: null,
-                    value: 'Test'
-                  }
-                ],
-                'eperson.language': [
-                  {
-                    language: null,
-                    value: 'en'
-                  }
-                ]
-              },
-              name: 'User Test',
-              netid: 'myself@testshib.org',
-              requireCertificate: false,
-              selfRegistered: false,
-              type: 'eperson',
-              uuid: '4dc70ab5-cd73-492f-b007-3179d2d9296b',
-              _links: {
-                self: {
-                  href: 'https://hasselt-dspace.dev01.4science.it/dspace-spring-rest/api/eperson/epersons/4dc70ab5-cd73-492f-b007-3179d2d9296b'
-                }
-              }
-            }
-          },
-          _links: {
-            eperson: {
-              href: 'https://hasselt-dspace.dev01.4science.it/dspace-spring-rest/api/eperson/epersons/4dc70ab5-cd73-492f-b007-3179d2d9296b'
-            },
-            self: {
-              href: 'https://hasselt-dspace.dev01.4science.it/dspace-spring-rest/api/authn/status'
-            }
-          }
-        },
-        statusCode: 200,
-        statusText: '200'
-
-      };
-    });
-
-    it('should return a AuthStatusResponse if data contains a valid AuthStatus object as payload', () => {
-      const response = service.parse(validRequest, validResponse);
-      expect(response.constructor).toBe(AuthStatusResponse);
-    });
-
-    it('should return a AuthStatusResponse if data contains a valid endpoint response', () => {
-      const response = service.parse(validRequest2, validResponse2);
-      expect(response.constructor).toBe(AuthStatusResponse);
-      expect(linkServiceStub.removeResolvedLinks).toHaveBeenCalled();
-    });
-
-    it('should return a AuthStatusResponse if data contains an empty 404 endpoint response', () => {
-      const response = service.parse(validRequest, validResponse1);
-      expect(response.constructor).toBe(AuthStatusResponse);
-    });
-
-  });
-});
diff --git a/src/app/core/auth/auth-response-parsing.service.ts b/src/app/core/auth/auth-response-parsing.service.ts
deleted file mode 100644
index 8c777709747..00000000000
--- a/src/app/core/auth/auth-response-parsing.service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { BaseResponseParsingService } from '../data/base-response-parsing.service';
-import { AuthStatusResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { isNotEmpty } from '../../shared/empty.util';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { ResponseParsingService } from '../data/parsing.service';
-import { RestRequest } from '../data/request.models';
-import { AuthStatus } from './models/auth-status.model';
-
-@Injectable()
-export class AuthResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-
-  protected toCache = true;
-
-  constructor(protected objectCache: ObjectCacheService) {
-    super();
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === 200)) {
-      const response = this.process<AuthStatus>(data.payload, request);
-      return new AuthStatusResponse(response, data.statusCode, data.statusText);
-    } else {
-      return new AuthStatusResponse(data.payload as AuthStatus, data.statusCode, data.statusText);
-    }
-  }
-}
diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts
index 9237c30db93..f80be890349 100644
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -3,7 +3,6 @@ import { Action } from '@ngrx/store';
 // import type function
 import { type } from '../../shared/ngrx/type';
 // import models
-import { EPerson } from '../eperson/models/eperson.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthStatus } from './models/auth-status.model';
@@ -31,13 +30,11 @@ export const AuthActionTypes = {
   LOG_OUT: type('dspace/auth/LOG_OUT'),
   LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'),
   LOG_OUT_SUCCESS: type('dspace/auth/LOG_OUT_SUCCESS'),
-  REGISTRATION: type('dspace/auth/REGISTRATION'),
-  REGISTRATION_ERROR: type('dspace/auth/REGISTRATION_ERROR'),
-  REGISTRATION_SUCCESS: type('dspace/auth/REGISTRATION_SUCCESS'),
   SET_REDIRECT_URL: type('dspace/auth/SET_REDIRECT_URL'),
   RETRIEVE_AUTHENTICATED_EPERSON: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON'),
   RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS'),
   RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'),
+  REDIRECT_AFTER_LOGIN_SUCCESS: type('dspace/auth/REDIRECT_AFTER_LOGIN_SUCCESS')
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -263,48 +260,6 @@ export class RetrieveTokenAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_TOKEN;
 }
 
-/**
- * Sign up.
- * @class RegistrationAction
- * @implements {Action}
- */
-export class RegistrationAction implements Action {
-  public type: string = AuthActionTypes.REGISTRATION;
-  payload: EPerson;
-
-  constructor(user: EPerson) {
-    this.payload = user;
-  }
-}
-
-/**
- * Sign up error.
- * @class RegistrationErrorAction
- * @implements {Action}
- */
-export class RegistrationErrorAction implements Action {
-  public type: string = AuthActionTypes.REGISTRATION_ERROR;
-  payload: Error;
-
-  constructor(payload: Error) {
-    this.payload = payload;
-  }
-}
-
-/**
- * Sign up success.
- * @class RegistrationSuccessAction
- * @implements {Action}
- */
-export class RegistrationSuccessAction implements Action {
-  public type: string = AuthActionTypes.REGISTRATION_SUCCESS;
-  payload: EPerson;
-
-  constructor(user: EPerson) {
-    this.payload = user;
-  }
-}
-
 /**
  * Add uthentication message.
  * @class AddAuthenticationMessageAction
@@ -381,6 +336,20 @@ export class SetRedirectUrlAction implements Action {
   }
 }
 
+/**
+ * Start loading for a hard redirect
+ * @class StartHardRedirectLoadingAction
+ * @implements {Action}
+ */
+export class RedirectAfterLoginSuccessAction implements Action {
+  public type: string = AuthActionTypes.REDIRECT_AFTER_LOGIN_SUCCESS;
+  payload: string;
+
+  constructor(url: string) {
+    this.payload = url;
+  }
+}
+
 /**
  * Retrieve the authenticated eperson.
  * @class RetrieveAuthenticatedEpersonAction
@@ -439,9 +408,6 @@ export type AuthActions
   | CheckAuthenticationTokenCookieAction
   | RedirectWhenAuthenticationIsRequiredAction
   | RedirectWhenTokenExpiredAction
-  | RegistrationAction
-  | RegistrationErrorAction
-  | RegistrationSuccessAction
   | AddAuthenticationMessageAction
   | RefreshTokenAction
   | RefreshTokenErrorAction
@@ -451,8 +417,8 @@ export type AuthActions
   | RetrieveAuthMethodsSuccessAction
   | RetrieveAuthMethodsErrorAction
   | RetrieveTokenAction
-  | ResetAuthenticationMessagesAction
   | RetrieveAuthenticatedEpersonAction
   | RetrieveAuthenticatedEpersonErrorAction
   | RetrieveAuthenticatedEpersonSuccessAction
-  | SetRedirectUrlAction;
+  | SetRedirectUrlAction
+  | RedirectAfterLoginSuccessAction;
diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts
index 5aaced609e9..79fe385c6d1 100644
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -1,9 +1,9 @@
-import { TestBed } from '@angular/core/testing';
+import { fakeAsync, flush, TestBed } from '@angular/core/testing';
 
 import { provideMockActions } from '@ngrx/effects/testing';
-import { Store } from '@ngrx/store';
+import { Store, StoreModule } from '@ngrx/store';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { cold, hot } from 'jasmine-marbles';
-
 import { Observable, of as observableOf, throwError as observableThrow } from 'rxjs';
 
 import { AuthEffects } from './auth.effects';
@@ -29,41 +29,53 @@ import {
 } from './auth.actions';
 import { authMethodsMock, AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { AuthService } from './auth.service';
-import { AuthState } from './auth.reducer';
-
+import { authReducer } from './auth.reducer';
 import { AuthStatus } from './models/auth-status.model';
 import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { AppState, storeModuleConfig } from '../../app.reducer';
+import { StoreActionTypes } from '../../store.actions';
+import { isAuthenticated, isAuthenticatedLoaded } from './selectors';
 
 describe('AuthEffects', () => {
   let authEffects: AuthEffects;
   let actions: Observable<any>;
   let authServiceStub;
-  const store: Store<AuthState> = jasmine.createSpyObj('store', {
-    /* tslint:disable:no-empty */
-    dispatch: {},
-    /* tslint:enable:no-empty */
-    select: observableOf(true)
-  });
+  let initialState;
   let token;
+  let store: MockStore<AppState>;
 
   function init() {
     authServiceStub = new AuthServiceStub();
     token = authServiceStub.getToken();
+    initialState = {
+      core: {
+        auth: {
+          authenticated: false,
+          loaded: false,
+          loading: false,
+          authMethods: []
+        }
+      }
+    };
   }
 
   beforeEach(() => {
     init();
     TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig)
+      ],
       providers: [
         AuthEffects,
+        provideMockStore({ initialState }),
         { provide: AuthService, useValue: authServiceStub },
-        { provide: Store, useValue: store },
         provideMockActions(() => actions),
         // other providers
       ],
     });
 
     authEffects = TestBed.get(AuthEffects);
+    store = TestBed.get(Store);
   });
 
   describe('authenticate$', () => {
@@ -138,7 +150,8 @@ describe('AuthEffects', () => {
 
   describe('authenticatedSuccess$', () => {
 
-    it('should return a RETRIEVE_AUTHENTICATED_EPERSON action in response to a AUTHENTICATED_SUCCESS action', () => {
+    it('should return a RETRIEVE_AUTHENTICATED_EPERSON action in response to a AUTHENTICATED_SUCCESS action', (done) => {
+      spyOn((authEffects as any).authService, 'storeToken');
       actions = hot('--a-', {
         a: {
           type: AuthActionTypes.AUTHENTICATED_SUCCESS, payload: {
@@ -151,8 +164,14 @@ describe('AuthEffects', () => {
 
       const expected = cold('--b-', { b: new RetrieveAuthenticatedEpersonAction(EPersonMock._links.self.href) });
 
+      authEffects.authenticatedSuccess$.subscribe(() => {
+        expect(authServiceStub.storeToken).toHaveBeenCalledWith(token);
+      });
+
       expect(authEffects.authenticatedSuccess$).toBeObservable(expected);
+      done();
     });
+
   });
 
   describe('checkToken$', () => {
@@ -362,4 +381,40 @@ describe('AuthEffects', () => {
       });
     })
   });
+
+  describe('clearInvalidTokenOnRehydrate$', () => {
+
+    beforeEach(() => {
+      store.overrideSelector(isAuthenticated, false);
+    });
+
+    describe('when auth loaded is false', () => {
+      it('should not call removeToken method', (done) => {
+        store.overrideSelector(isAuthenticatedLoaded, false);
+        actions = hot('--a-|', { a: { type: StoreActionTypes.REHYDRATE } });
+        spyOn(authServiceStub, 'removeToken');
+
+        authEffects.clearInvalidTokenOnRehydrate$.subscribe(() => {
+          expect(authServiceStub.removeToken).not.toHaveBeenCalled();
+
+        });
+
+        done();
+      });
+    });
+
+    describe('when auth loaded is true', () => {
+      it('should call removeToken method', fakeAsync(() => {
+        store.overrideSelector(isAuthenticatedLoaded, true);
+        actions = hot('--a-|', { a: { type: StoreActionTypes.REHYDRATE } });
+        spyOn(authServiceStub, 'removeToken');
+
+        authEffects.clearInvalidTokenOnRehydrate$.subscribe(() => {
+          expect(authServiceStub.removeToken).toHaveBeenCalled();
+          flush();
+        });
+
+      }));
+    });
+  });
 });
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index 717aaff01ed..ab18dcb508d 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,20 +1,18 @@
-import { Observable, of as observableOf } from 'rxjs';
-
-import { catchError, debounceTime, filter, map, switchMap, take, tap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
 // import @ngrx
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, select, Store } from '@ngrx/store';
 
 // import services
 import { AuthService } from './auth.service';
-
 import { EPerson } from '../eperson/models/eperson.model';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AppState } from '../../app.reducer';
-import { isAuthenticated } from './selectors';
+import { isAuthenticated, isAuthenticatedLoaded } from './selectors';
 import { StoreActionTypes } from '../../store.actions';
 import { AuthMethod } from './models/auth.method';
 // import actions
@@ -29,12 +27,10 @@ import {
   CheckAuthenticationTokenCookieAction,
   LogOutErrorAction,
   LogOutSuccessAction,
+  RedirectAfterLoginSuccessAction,
   RefreshTokenAction,
   RefreshTokenErrorAction,
   RefreshTokenSuccessAction,
-  RegistrationAction,
-  RegistrationErrorAction,
-  RegistrationSuccessAction,
   RetrieveAuthenticatedEpersonAction,
   RetrieveAuthenticatedEpersonErrorAction,
   RetrieveAuthenticatedEpersonSuccessAction,
@@ -67,7 +63,6 @@ export class AuthEffects {
   @Effect()
   public authenticateSuccess$: Observable<Action> = this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATE_SUCCESS),
-    tap((action: AuthenticationSuccessAction) => this.authService.storeToken(action.payload)),
     map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload))
   );
 
@@ -84,7 +79,27 @@ export class AuthEffects {
   @Effect()
   public authenticatedSuccess$: Observable<Action> = this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATED_SUCCESS),
-    map((action: AuthenticatedSuccessAction) => new RetrieveAuthenticatedEpersonAction(action.payload.userHref))
+    tap((action: AuthenticatedSuccessAction) => this.authService.storeToken(action.payload.authToken)),
+    switchMap((action: AuthenticatedSuccessAction) => this.authService.getRedirectUrl().pipe(
+      take(1),
+      map((redirectUrl: string) => [action, redirectUrl])
+    )),
+    map(([action, redirectUrl]: [AuthenticatedSuccessAction, string]) => {
+      if (hasValue(redirectUrl)) {
+        return new RedirectAfterLoginSuccessAction(redirectUrl);
+      } else {
+        return new RetrieveAuthenticatedEpersonAction(action.payload.userHref);
+      }
+    })
+  );
+
+  @Effect({ dispatch: false })
+  public redirectAfterLoginSuccess$: Observable<Action> = this.actions$.pipe(
+    ofType(AuthActionTypes.REDIRECT_AFTER_LOGIN_SUCCESS),
+    tap((action: RedirectAfterLoginSuccessAction) => {
+      this.authService.clearRedirectUrl();
+      this.authService.navigateToRedirectUrl(action.payload);
+    })
   );
 
   // It means "reacts to this action but don't send another"
@@ -138,18 +153,6 @@ export class AuthEffects {
     })
   );
 
-  @Effect()
-  public createUser$: Observable<Action> = this.actions$.pipe(
-    ofType(AuthActionTypes.REGISTRATION),
-    debounceTime(500), // to remove when functionality is implemented
-    switchMap((action: RegistrationAction) => {
-      return this.authService.create(action.payload).pipe(
-        map((user: EPerson) => new RegistrationSuccessAction(user)),
-        catchError((error) => observableOf(new RegistrationErrorAction(error)))
-      );
-    })
-  );
-
   @Effect()
   public retrieveToken$: Observable<Action> = this.actions$.pipe(
     ofType(AuthActionTypes.RETRIEVE_TOKEN),
@@ -187,10 +190,11 @@ export class AuthEffects {
   public clearInvalidTokenOnRehydrate$: Observable<any> = this.actions$.pipe(
     ofType(StoreActionTypes.REHYDRATE),
     switchMap(() => {
-      return this.store.pipe(
-        select(isAuthenticated),
+      const isLoaded$ = this.store.pipe(select(isAuthenticatedLoaded));
+      const authenticated$ = this.store.pipe(select(isAuthenticated));
+      return observableCombineLatest(isLoaded$, authenticated$).pipe(
         take(1),
-        filter((authenticated) => !authenticated),
+        filter(([loaded, authenticated]) => loaded && !authenticated),
         tap(() => this.authService.removeToken()),
         tap(() => this.authService.resetAuthenticationError())
       );
@@ -217,13 +221,6 @@ export class AuthEffects {
       tap(() => this.authService.refreshAfterLogout())
     );
 
-  @Effect({ dispatch: false })
-  public redirectToLogin$: Observable<Action> = this.actions$
-    .pipe(ofType(AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED),
-      tap(() => this.authService.removeToken()),
-      tap(() => this.authService.redirectToLogin())
-    );
-
   @Effect({ dispatch: false })
   public redirectToLoginTokenExpired$: Observable<Action> = this.actions$
     .pipe(
diff --git a/src/app/core/auth/auth.interceptor.spec.ts b/src/app/core/auth/auth.interceptor.spec.ts
index f5ac0c4361f..5bfaaa323bd 100644
--- a/src/app/core/auth/auth.interceptor.spec.ts
+++ b/src/app/core/auth/auth.interceptor.spec.ts
@@ -8,14 +8,14 @@ import { of as observableOf } from 'rxjs';
 
 import { AuthInterceptor } from './auth.interceptor';
 import { AuthService } from './auth.service';
-import { DSpaceRESTv2Service } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { RouterStub } from '../../shared/testing/router.stub';
 import { TruncatablesState } from '../../shared/truncatable/truncatable.reducer';
 import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { RestRequestMethod } from '../data/rest-request-method';
 
 describe(`AuthInterceptor`, () => {
-  let service: DSpaceRESTv2Service;
+  let service: DspaceRestService;
   let httpMock: HttpTestingController;
 
   const authServiceStub = new AuthServiceStub();
@@ -30,7 +30,7 @@ describe(`AuthInterceptor`, () => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
       providers: [
-        DSpaceRESTv2Service,
+        DspaceRestService,
         {provide: AuthService, useValue: authServiceStub},
         {provide: Router, useClass: RouterStub},
         {
@@ -42,13 +42,13 @@ describe(`AuthInterceptor`, () => {
       ],
     });
 
-    service = TestBed.get(DSpaceRESTv2Service);
+    service = TestBed.get(DspaceRestService);
     httpMock = TestBed.get(HttpTestingController);
   });
 
   describe('when has a valid token', () => {
 
-    it('should not add an Authorization header when we’re sending a HTTP request to \'authn\' endpoint', () => {
+    it('should not add an Authorization header when we’re sending a HTTP request to \'authn\' endpoint that is not the logout endpoint', () => {
       service.request(RestRequestMethod.POST, 'dspace-spring-rest/api/authn/login', 'password=password&user=user').subscribe((response) => {
         expect(response).toBeTruthy();
       });
@@ -58,8 +58,19 @@ describe(`AuthInterceptor`, () => {
       const token = httpRequest.request.headers.get('authorization');
       expect(token).toBeNull();
     });
+    it('should add an Authorization header when we’re sending a HTTP request to the\'authn/logout\' endpoint', () => {
+      service.request(RestRequestMethod.POST, 'dspace-spring-rest/api/authn/logout', 'test').subscribe((response) => {
+        expect(response).toBeTruthy();
+      });
+
+      const httpRequest = httpMock.expectOne(`dspace-spring-rest/api/authn/logout`);
+
+      expect(httpRequest.request.headers.has('authorization'));
+      const token = httpRequest.request.headers.get('authorization');
+      expect(token).toBe('Bearer token_test');
+    });
 
-    it('should add an Authorization header when we’re sending a HTTP request to \'authn\' endpoint', () => {
+    it('should add an Authorization header when we’re sending a HTTP request to a non-\'authn\' endpoint', () => {
       service.request(RestRequestMethod.POST, 'dspace-spring-rest/api/submission/workspaceitems', 'test').subscribe((response) => {
         expect(response).toBeTruthy();
       });
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index bf11d00ccd8..3366cdb3d89 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -221,7 +221,7 @@ export class AuthInterceptor implements HttpInterceptor {
       // Redirect to the login route
       this.store.dispatch(new RedirectWhenTokenExpiredAction('auth.messages.expired'));
       return observableOf(null);
-    } else if (!this.isAuthRequest(req) && isNotEmpty(token)) {
+    } else if ((!this.isAuthRequest(req) || this.isLogoutResponse(req)) && isNotEmpty(token)) {
       // Intercept a request that is not to the authentication endpoint
       authService.isTokenExpiring().pipe(
         filter((isExpiring) => isExpiring))
@@ -251,7 +251,6 @@ export class AuthInterceptor implements HttpInterceptor {
 
     // Pass on the new request instead of the original request.
     return next.handle(newReq).pipe(
-      // tap((response) => console.log('next.handle: ', response)),
       map((response) => {
         // Intercept a Login/Logout response
         if (response instanceof HttpResponse && this.isSuccess(response) && this.isAuthRequest(response)) {
diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index cf934a7f47b..4c6f1e2a256 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -42,6 +42,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: true,
       loading: false,
     };
     const action = new AuthenticateAction('user', 'password');
@@ -49,6 +50,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: true,
       error: undefined,
       loading: true,
       info: undefined
@@ -62,6 +64,7 @@ describe('authReducer', () => {
       authenticated: false,
       loaded: false,
       error: undefined,
+      blocking: true,
       loading: true,
       info: undefined
     };
@@ -76,6 +79,7 @@ describe('authReducer', () => {
       authenticated: false,
       loaded: false,
       error: undefined,
+      blocking: true,
       loading: true,
       info: undefined
     };
@@ -84,6 +88,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       info: undefined,
       authToken: undefined,
@@ -96,6 +101,7 @@ describe('authReducer', () => {
   it('should properly set the state, in response to a AUTHENTICATED action', () => {
     initialState = {
       authenticated: false,
+      blocking: false,
       loaded: false,
       error: undefined,
       loading: true,
@@ -103,8 +109,15 @@ describe('authReducer', () => {
     };
     const action = new AuthenticatedAction(mockTokenInfo);
     const newState = authReducer(initialState, action);
-
-    expect(newState).toEqual(initialState);
+    state = {
+      authenticated: false,
+      blocking: true,
+      loaded: false,
+      error: undefined,
+      loading: true,
+      info: undefined
+    };
+    expect(newState).toEqual(state);
   });
 
   it('should properly set the state, in response to a AUTHENTICATED_SUCCESS action', () => {
@@ -112,6 +125,7 @@ describe('authReducer', () => {
       authenticated: false,
       loaded: false,
       error: undefined,
+      blocking: true,
       loading: true,
       info: undefined
     };
@@ -122,6 +136,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: false,
       error: undefined,
+      blocking: true,
       loading: true,
       info: undefined
     };
@@ -133,6 +148,7 @@ describe('authReducer', () => {
       authenticated: false,
       loaded: false,
       error: undefined,
+      blocking: true,
       loading: true,
       info: undefined
     };
@@ -143,6 +159,7 @@ describe('authReducer', () => {
       authToken: undefined,
       error: 'Test error message',
       loaded: true,
+      blocking: false,
       loading: false,
       info: undefined
     };
@@ -153,6 +170,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
     };
     const action = new CheckAuthenticationTokenAction();
@@ -160,6 +178,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: true,
       loading: true,
     };
     expect(newState).toEqual(state);
@@ -169,6 +188,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: true,
     };
     const action = new CheckAuthenticationTokenCookieAction();
@@ -176,6 +196,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: true,
       loading: true,
     };
     expect(newState).toEqual(state);
@@ -187,6 +208,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id
@@ -204,6 +226,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id
@@ -216,7 +239,8 @@ describe('authReducer', () => {
       authToken: undefined,
       error: undefined,
       loaded: false,
-      loading: false,
+      blocking: true,
+      loading: true,
       info: undefined,
       refreshing: false,
       userId: undefined
@@ -230,6 +254,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id
@@ -242,6 +267,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: 'Test error message',
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id
@@ -255,6 +281,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: false,
       error: undefined,
+      blocking: true,
       loading: true,
       info: undefined
     };
@@ -265,6 +292,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id
@@ -277,6 +305,7 @@ describe('authReducer', () => {
       authenticated: false,
       loaded: false,
       error: undefined,
+      blocking: true,
       loading: true,
       info: undefined
     };
@@ -287,6 +316,7 @@ describe('authReducer', () => {
       authToken: undefined,
       error: 'Test error message',
       loaded: true,
+      blocking: false,
       loading: false,
       info: undefined
     };
@@ -299,6 +329,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id
@@ -311,6 +342,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
@@ -325,6 +357,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
@@ -338,6 +371,7 @@ describe('authReducer', () => {
       authToken: newTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
@@ -352,6 +386,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
@@ -364,6 +399,7 @@ describe('authReducer', () => {
       authToken: undefined,
       error: undefined,
       loaded: false,
+      blocking: false,
       loading: false,
       info: undefined,
       refreshing: false,
@@ -378,6 +414,7 @@ describe('authReducer', () => {
       authToken: mockTokenInfo,
       loaded: true,
       error: undefined,
+      blocking: false,
       loading: false,
       info: undefined,
       userId: EPersonMock.id
@@ -387,6 +424,7 @@ describe('authReducer', () => {
       authenticated: false,
       authToken: undefined,
       loaded: false,
+      blocking: false,
       loading: false,
       error: undefined,
       info: 'Message',
@@ -410,6 +448,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
     };
     const action = new AddAuthenticationMessageAction('Message');
@@ -417,6 +456,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       info: 'Message'
     };
@@ -427,6 +467,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       error: 'Error',
       info: 'Message'
@@ -436,6 +477,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       error: undefined,
       info: undefined
@@ -447,6 +489,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false
     };
     const action = new SetRedirectUrlAction('redirect.url');
@@ -454,6 +497,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       redirectUrl: 'redirect.url'
     };
@@ -464,6 +508,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       authMethods: []
     };
@@ -472,6 +517,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: true,
       loading: true,
       authMethods: []
     };
@@ -482,6 +528,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: true,
       loading: true,
       authMethods: []
     };
@@ -494,6 +541,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       authMethods: authMethods
     };
@@ -504,6 +552,7 @@ describe('authReducer', () => {
     initialState = {
       authenticated: false,
       loaded: false,
+      blocking: true,
       loading: true,
       authMethods: []
     };
@@ -513,6 +562,7 @@ describe('authReducer', () => {
     state = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false,
       authMethods: [new AuthMethod(AuthMethodType.Password)]
     };
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index 16990b35a82..6d5635f263b 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -39,6 +39,10 @@ export interface AuthState {
   // true when loading
   loading: boolean;
 
+  // true when everything else should wait for authorization
+  // to complete
+  blocking: boolean;
+
   // info message
   info?: string;
 
@@ -62,6 +66,7 @@ export interface AuthState {
 const initialState: AuthState = {
   authenticated: false,
   loaded: false,
+  blocking: true,
   loading: false,
   authMethods: []
 };
@@ -86,7 +91,8 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
     case AuthActionTypes.CHECK_AUTHENTICATION_TOKEN:
     case AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE:
       return Object.assign({}, state, {
-        loading: true
+        loading: true,
+        blocking: true
       });
 
     case AuthActionTypes.AUTHENTICATED_ERROR:
@@ -96,6 +102,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         authToken: undefined,
         error: (action as AuthenticationErrorAction).payload.message,
         loaded: true,
+        blocking: false,
         loading: false
       });
 
@@ -110,16 +117,17 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loaded: true,
         error: undefined,
         loading: false,
+        blocking: false,
         info: undefined,
         userId: (action as RetrieveAuthenticatedEpersonSuccessAction).payload
       });
 
     case AuthActionTypes.AUTHENTICATE_ERROR:
-    case AuthActionTypes.REGISTRATION_ERROR:
       return Object.assign({}, state, {
         authenticated: false,
         authToken: undefined,
         error: (action as AuthenticationErrorAction).payload.message,
+        blocking: false,
         loading: false
       });
 
@@ -133,42 +141,44 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         error: (action as LogOutErrorAction).payload.message
       });
 
-    case AuthActionTypes.LOG_OUT_SUCCESS:
     case AuthActionTypes.REFRESH_TOKEN_ERROR:
       return Object.assign({}, state, {
         authenticated: false,
         authToken: undefined,
         error: undefined,
         loaded: false,
+        blocking: false,
         loading: false,
         info: undefined,
         refreshing: false,
         userId: undefined
       });
 
-    case AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED:
-    case AuthActionTypes.REDIRECT_TOKEN_EXPIRED:
+    case AuthActionTypes.LOG_OUT_SUCCESS:
       return Object.assign({}, state, {
         authenticated: false,
         authToken: undefined,
+        error: undefined,
         loaded: false,
-        loading: false,
-        info: (action as RedirectWhenTokenExpiredAction as RedirectWhenAuthenticationIsRequiredAction).payload,
+        blocking: true,
+        loading: true,
+        info: undefined,
+        refreshing: false,
         userId: undefined
       });
 
-    case AuthActionTypes.REGISTRATION:
+    case AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED:
+    case AuthActionTypes.REDIRECT_TOKEN_EXPIRED:
       return Object.assign({}, state, {
         authenticated: false,
         authToken: undefined,
-        error: undefined,
-        loading: true,
-        info: undefined
+        loaded: false,
+        blocking: false,
+        loading: false,
+        info: (action as RedirectWhenTokenExpiredAction as RedirectWhenAuthenticationIsRequiredAction).payload,
+        userId: undefined
       });
 
-    case AuthActionTypes.REGISTRATION_SUCCESS:
-      return state;
-
     case AuthActionTypes.REFRESH_TOKEN:
       return Object.assign({}, state, {
         refreshing: true,
@@ -194,18 +204,21 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
     // next three cases are used by dynamic rendering of login methods
     case AuthActionTypes.RETRIEVE_AUTH_METHODS:
       return Object.assign({}, state, {
-        loading: true
+        loading: true,
+        blocking: true
       });
 
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_SUCCESS:
       return Object.assign({}, state, {
         loading: false,
+        blocking: false,
         authMethods: (action as RetrieveAuthMethodsSuccessAction).payload
       });
 
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_ERROR:
       return Object.assign({}, state, {
         loading: false,
+        blocking: false,
         authMethods: [new AuthMethod(AuthMethodType.Password)]
       });
 
@@ -214,6 +227,12 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         redirectUrl: (action as SetRedirectUrlAction).payload,
       });
 
+    case AuthActionTypes.REDIRECT_AFTER_LOGIN_SUCCESS:
+      return Object.assign({}, state, {
+        loading: true,
+        blocking: true,
+      });
+
     default:
       return state;
   }
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index 3b6fae4dd15..d3c2b6c44d5 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -1,17 +1,14 @@
 import { async, inject, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
-
 import { Store, StoreModule } from '@ngrx/store';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 import { of as observableOf } from 'rxjs';
-
 import { authReducer, AuthState } from './auth.reducer';
 import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 import { AuthService, IMPERSONATING_COOKIE } from './auth.service';
 import { RouterStub } from '../../shared/testing/router.stub';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-
 import { CookieService } from '../services/cookie.service';
 import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service.stub';
 import { AuthRequestService } from './auth-request.service';
@@ -30,6 +27,7 @@ import { EPersonDataService } from '../eperson/eperson-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { authMethodsMock } from '../../shared/testing/auth-service.stub';
 import { AuthMethod } from './models/auth.method';
+import { HardRedirectService } from '../services/hard-redirect.service';
 
 describe('AuthService test', () => {
 
@@ -49,7 +47,9 @@ describe('AuthService test', () => {
   let storage: CookieService;
   let token: AuthTokenInfo;
   let authenticatedState;
+  let unAuthenticatedState;
   let linkService;
+  let hardRedirectService;
 
   function init() {
     mockStore = jasmine.createSpyObj('store', {
@@ -67,11 +67,19 @@ describe('AuthService test', () => {
       authToken: token,
       user: EPersonMock
     };
+    unAuthenticatedState = {
+      authenticated: false,
+      loaded: true,
+      loading: false,
+      authToken: undefined,
+      user: undefined
+    };
     authRequest = new AuthRequestServiceStub();
     routeStub = new ActivatedRouteStub();
     linkService = {
       resolveLinks: {}
     };
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', ['redirect']);
     spyOn(linkService, 'resolveLinks').and.returnValue({ authenticated: true, eperson: observableOf({ payload: {} }) });
 
   }
@@ -99,6 +107,7 @@ describe('AuthService test', () => {
           { provide: ActivatedRoute, useValue: routeStub },
           { provide: Store, useValue: mockStore },
           { provide: EPersonDataService, useValue: mockEpersonDataService },
+          { provide: HardRedirectService, useValue: hardRedirectService },
           CookieService,
           AuthService
         ],
@@ -205,7 +214,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store);
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService);
     }));
 
     it('should return true when user is logged in', () => {
@@ -214,6 +223,12 @@ describe('AuthService test', () => {
       });
     });
 
+    it('should return the shortlived token when user is logged in', () => {
+      authService.getShortlivedToken().subscribe((shortlivedToken: string) => {
+        expect(shortlivedToken).toEqual(authRequest.mockShortLivedToken);
+      });
+    });
+
     it('should return token object when it is valid', () => {
       authService.hasValidAuthenticationToken().subscribe((tokenState: AuthTokenInfo) => {
         expect(tokenState).toBe(token);
@@ -230,6 +245,12 @@ describe('AuthService test', () => {
       expect(result).toBe(false);
     });
 
+    it('should return true when authentication is loaded', () => {
+      authService.isAuthenticationLoaded().subscribe((status: boolean) => {
+        expect(status).toBe(true);
+      });
+    });
+
   });
 
   describe('', () => {
@@ -272,7 +293,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store);
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService);
       storage = (authService as any).storage;
       routeServiceMock = TestBed.get(RouteService);
       routerStub = TestBed.get(Router);
@@ -301,36 +322,28 @@ describe('AuthService test', () => {
       expect(storage.remove).toHaveBeenCalled();
     });
 
-    it('should set redirect url to previous page', () => {
-      spyOn(routeServiceMock, 'getHistory').and.callThrough();
-      spyOn(routerStub, 'navigateByUrl');
-      authService.redirectAfterLoginSuccess(true);
-      expect(routeServiceMock.getHistory).toHaveBeenCalled();
-      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/collection/123');
+    it('should redirect to reload with redirect url', () => {
+      authService.navigateToRedirectUrl('/collection/123');
+      // Reload with redirect URL set to /collection/123
+      expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*\\?redirect=' + encodeURIComponent('/collection/123'))));
     });
 
-    it('should set redirect url to current page', () => {
-      spyOn(routeServiceMock, 'getHistory').and.callThrough();
-      spyOn(routerStub, 'navigateByUrl');
-      authService.redirectAfterLoginSuccess(false);
-      expect(routeServiceMock.getHistory).toHaveBeenCalled();
-      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/home');
+    it('should redirect to reload with /home', () => {
+      authService.navigateToRedirectUrl('/home');
+      // Reload with redirect URL set to /home
+      expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*\\?redirect=' + encodeURIComponent('/home'))));
     });
 
-    it('should redirect to / and not to /login', () => {
-      spyOn(routeServiceMock, 'getHistory').and.returnValue(observableOf(['/login', '/login']));
-      spyOn(routerStub, 'navigateByUrl');
-      authService.redirectAfterLoginSuccess(true);
-      expect(routeServiceMock.getHistory).toHaveBeenCalled();
-      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/');
+    it('should redirect to regular reload and not to /login', () => {
+      authService.navigateToRedirectUrl('/login');
+      // Reload without a redirect URL
+      expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*(?!\\?)$')));
     });
 
-    it('should redirect to / when no redirect url is found', () => {
-      spyOn(routeServiceMock, 'getHistory').and.returnValue(observableOf(['']));
-      spyOn(routerStub, 'navigateByUrl');
-      authService.redirectAfterLoginSuccess(true);
-      expect(routeServiceMock.getHistory).toHaveBeenCalled();
-      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/');
+    it('should redirect to regular reload when no redirect url is found', () => {
+      authService.navigateToRedirectUrl(undefined);
+      // Reload without a redirect URL
+      expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*(?!\\?)$')));
     });
 
     describe('impersonate', () => {
@@ -447,5 +460,53 @@ describe('AuthService test', () => {
         });
       });
     });
+
+    describe('refreshAfterLogout', () => {
+      it('should call navigateToRedirectUrl with no url', () => {
+        spyOn(authService as any, 'navigateToRedirectUrl').and.stub();
+        authService.refreshAfterLogout();
+        expect((authService as any).navigateToRedirectUrl).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('when user is not logged in', () => {
+    beforeEach(async(() => {
+      init();
+      TestBed.configureTestingModule({
+        imports: [
+          StoreModule.forRoot({ authReducer }, {
+            runtimeChecks: {
+              strictStateImmutability: false,
+              strictActionImmutability: false
+            }
+          })
+        ],
+        providers: [
+          { provide: AuthRequestService, useValue: authRequest },
+          { provide: REQUEST, useValue: {} },
+          { provide: Router, useValue: routerStub },
+          { provide: RouteService, useValue: routeServiceStub },
+          { provide: RemoteDataBuildService, useValue: linkService },
+          CookieService,
+          AuthService
+        ]
+      }).compileComponents();
+    }));
+
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService) => {
+      store
+        .subscribe((state) => {
+          (state as any).core = Object.create({});
+          (state as any).core.auth = unAuthenticatedState;
+        });
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService);
+    }));
+
+    it('should return null for the shortlived token', () => {
+      authService.getShortlivedToken().subscribe((shortlivedToken: string) => {
+        expect(shortlivedToken).toBeNull();
+      });
+    });
   });
 });
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 588d9e26751..51c4a6cbf3c 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -1,29 +1,37 @@
 import { Inject, Injectable, Optional } from '@angular/core';
-import { PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree } from '@angular/router';
+import { Router } from '@angular/router';
 import { HttpHeaders } from '@angular/common/http';
 import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 
 import { Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged, filter, map, startWith, switchMap, take, withLatestFrom } from 'rxjs/operators';
-import { RouterReducerState } from '@ngrx/router-store';
+import { map, startWith, switchMap, take } from 'rxjs/operators';
 import { select, Store } from '@ngrx/store';
 import { CookieAttributes } from 'js-cookie';
 
 import { EPerson } from '../eperson/models/eperson.model';
 import { AuthRequestService } from './auth-request.service';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model';
-import { hasValue, hasValueOperator, isEmpty, isNotEmpty, isNotNull, isNotUndefined } from '../../shared/empty.util';
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+  hasNoValue
+} from '../../shared/empty.util';
 import { CookieService } from '../services/cookie.service';
 import {
   getAuthenticatedUserId,
   getAuthenticationToken,
   getRedirectUrl,
   isAuthenticated,
-  isTokenRefreshing
+  isTokenRefreshing,
+  isAuthenticatedLoaded
 } from './selectors';
-import { AppState, routerStateSelector } from '../../app.reducer';
+import { AppState } from '../../app.reducer';
 import {
   CheckAuthenticationTokenAction,
   ResetAuthenticationMessagesAction,
@@ -35,6 +43,8 @@ import { RouteService } from '../services/route.service';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { getAllSucceededRemoteDataPayload } from '../shared/operators';
 import { AuthMethod } from './models/auth.method';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { RemoteData } from '../data/remote-data';
 
 export const LOGIN_ROUTE = '/login';
 export const LOGOUT_ROUTE = '/logout';
@@ -61,43 +71,13 @@ export class AuthService {
               protected router: Router,
               protected routeService: RouteService,
               protected storage: CookieService,
-              protected store: Store<AppState>
+              protected store: Store<AppState>,
+              protected hardRedirectService: HardRedirectService
   ) {
     this.store.pipe(
       select(isAuthenticated),
       startWith(false)
     ).subscribe((authenticated: boolean) => this._authenticated = authenticated);
-
-    // If current route is different from the one setted in authentication guard
-    // and is not the login route, clear redirect url and messages
-    const routeUrl$ = this.store.pipe(
-      select(routerStateSelector),
-      filter((routerState: RouterReducerState) => isNotUndefined(routerState)
-        && isNotUndefined(routerState.state) && isNotEmpty(routerState.state.url)),
-      filter((routerState: RouterReducerState) => !this.isLoginRoute(routerState.state.url)),
-      map((routerState: RouterReducerState) => routerState.state.url)
-    );
-    const redirectUrl$ = this.store.pipe(select(getRedirectUrl), distinctUntilChanged());
-    routeUrl$.pipe(
-      withLatestFrom(redirectUrl$),
-      map(([routeUrl, redirectUrl]) => [routeUrl, redirectUrl])
-    ).pipe(filter(([routeUrl, redirectUrl]) => isNotEmpty(redirectUrl) && (routeUrl !== redirectUrl)))
-      .subscribe(() => {
-        this.clearRedirectUrl();
-      });
-  }
-
-  /**
-   * Check if is a login page route
-   *
-   * @param {string} url
-   * @returns {Boolean}.
-   */
-  protected isLoginRoute(url: string) {
-    const urlTree: UrlTree = this.router.parseUrl(url);
-    const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];
-    const segment = '/' + g.toString();
-    return segment === LOGIN_ROUTE;
   }
 
   /**
@@ -115,9 +95,9 @@ export class AuthService {
     headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
     options.headers = headers;
     return this.authRequestService.postToEndpoint('login', body, options).pipe(
-      map((status: AuthStatus) => {
-        if (status.authenticated) {
-          return status;
+      map((rd: RemoteData<AuthStatus>) => {
+        if (hasValue(rd.payload) && rd.payload.authenticated) {
+          return rd.payload;
         } else {
           throw(new Error('Invalid email or password'));
         }
@@ -136,7 +116,7 @@ export class AuthService {
     options.headers = headers;
     options.withCredentials = true;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((status: AuthStatus) => Object.assign(new AuthStatus(), status))
+      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
     );
   }
 
@@ -148,6 +128,14 @@ export class AuthService {
     return this.store.pipe(select(isAuthenticated));
   }
 
+  /**
+   * Determines if authentication is loaded
+   * @returns {Observable<boolean>}
+   */
+  public isAuthenticationLoaded(): Observable<boolean> {
+    return this.store.pipe(select(isAuthenticatedLoaded));
+  }
+
   /**
    * Returns the href link to authenticated user
    * @returns {string}
@@ -160,8 +148,9 @@ export class AuthService {
     headers = headers.append('Authorization', `Bearer ${token.accessToken}`);
     options.headers = headers;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((status: AuthStatus) => {
-        if (status.authenticated) {
+      map((rd: RemoteData<AuthStatus>) => {
+        const status = rd.payload;
+        if (hasValue(status) && status.authenticated) {
           return status._links.eperson.href;
         } else {
           throw(new Error('Not authenticated'));
@@ -197,7 +186,7 @@ export class AuthService {
     return this.store.pipe(
       select(getAuthenticatedUserId),
       hasValueOperator(),
-      switchMap((id: string) => this.epersonService.findById(id)),
+      switchMap((id: string) => this.epersonService.findById(id) ),
       getAllSucceededRemoteDataPayload()
     )
   }
@@ -242,8 +231,9 @@ export class AuthService {
     options.headers = headers;
     options.withCredentials = true;
     return this.authRequestService.postToEndpoint('login', {}, options).pipe(
-      map((status: AuthStatus) => {
-        if (status.authenticated) {
+      map((rd: RemoteData<AuthStatus>) => {
+        const status = rd.payload;
+        if (hasValue(status) && status.authenticated) {
           return status.token;
         } else {
           throw(new Error('Not authenticated'));
@@ -270,18 +260,6 @@ export class AuthService {
     return observableOf(authMethods);
   }
 
-  /**
-   * Create a new user
-   * @returns {User}
-   */
-  public create(user: EPerson): Observable<EPerson> {
-    // Normally you would do an HTTP request to POST the user
-    // details and then return the new user object
-    // but, let's just return the new user for this example.
-    // this._authenticated = true;
-    return observableOf(user);
-  }
-
   /**
    * End session
    * @returns {Observable<boolean>}
@@ -292,8 +270,9 @@ export class AuthService {
     headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
     const options: HttpOptions = Object.create({ headers, responseType: 'text' });
     return this.authRequestService.getRequest('logout', options).pipe(
-      map((status: AuthStatus) => {
-        if (!status.authenticated) {
+      map((rd: RemoteData<AuthStatus>) => {
+        const status = rd.payload;
+        if (hasValue(status) && !status.authenticated) {
           return true;
         } else {
           throw(new Error('auth.errors.invalid-user'));
@@ -412,69 +391,38 @@ export class AuthService {
   }
 
   /**
-   * Redirect to the route navigated before the login
+   * Perform a hard redirect to the URL
+   * @param redirectUrl
    */
-  public redirectAfterLoginSuccess(isStandalonePage: boolean) {
-    this.getRedirectUrl().pipe(
-      take(1))
-      .subscribe((redirectUrl) => {
-
-        if (isNotEmpty(redirectUrl)) {
-          this.clearRedirectUrl();
-          this.router.onSameUrlNavigation = 'reload';
-          this.navigateToRedirectUrl(redirectUrl);
-        } else {
-          // If redirectUrl is empty use history.
-          this.routeService.getHistory().pipe(
-            take(1)
-          ).subscribe((history) => {
-            let redirUrl;
-            if (isStandalonePage) {
-              // For standalone login pages, use the previous route.
-              redirUrl = history[history.length - 2] || '';
-            } else {
-              redirUrl = history[history.length - 1] || '';
-            }
-            this.navigateToRedirectUrl(redirUrl);
-          });
-        }
-      });
-
-  }
-
-  protected navigateToRedirectUrl(redirectUrl: string) {
-    const url = decodeURIComponent(redirectUrl);
-    // in case the user navigates directly to /login (via bookmark, etc), or the route history is not found.
-    if (isEmpty(url) || url.startsWith(LOGIN_ROUTE)) {
-      this.router.navigateByUrl('/');
-      /* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
-      // this._window.nativeWindow.location.href = '/';
-    } else {
-      /* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
-      // this._window.nativeWindow.location.href = url;
-      this.router.navigateByUrl(url);
+  public navigateToRedirectUrl(redirectUrl: string) {
+    let url = `/reload/${new Date().getTime()}`;
+    if (isNotEmpty(redirectUrl) && !redirectUrl.startsWith(LOGIN_ROUTE)) {
+      url += `?redirect=${encodeURIComponent(redirectUrl)}`;
     }
+    this.hardRedirectService.redirect(url);
   }
 
   /**
    * Refresh route navigated
    */
   public refreshAfterLogout() {
-    // Hard redirect to the reload page with a unique number behind it
-    // so that all state is definitely lost
-    this._window.nativeWindow.location.href = `/reload/${new Date().getTime()}`;
+    this.navigateToRedirectUrl(undefined);
   }
 
   /**
    * Get redirect url
    */
   getRedirectUrl(): Observable<string> {
-    const redirectUrl = this.storage.get(REDIRECT_COOKIE);
-    if (isNotEmpty(redirectUrl)) {
-      return observableOf(redirectUrl);
-    } else {
-      return this.store.pipe(select(getRedirectUrl));
-    }
+    return this.store.pipe(
+      select(getRedirectUrl),
+      map((urlFromStore: string) => {
+        if (hasValue(urlFromStore)) {
+          return urlFromStore;
+        } else {
+          return this.storage.get(REDIRECT_COOKIE);
+        }
+      })
+    );
   }
 
   /**
@@ -491,11 +439,25 @@ export class AuthService {
     this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : ''));
   }
 
+  /**
+   * Set the redirect url if the current one has not been set yet
+   * @param newRedirectUrl
+   */
+  setRedirectUrlIfNotSet(newRedirectUrl: string) {
+    this.getRedirectUrl().pipe(
+      take(1))
+      .subscribe((currentRedirectUrl) => {
+        if (hasNoValue(currentRedirectUrl)) {
+          this.setRedirectUrl(newRedirectUrl);
+        }
+      })
+  }
+
   /**
    * Clear redirect url
    */
   clearRedirectUrl() {
-    this.store.dispatch(new SetRedirectUrlAction(''));
+    this.store.dispatch(new SetRedirectUrlAction(undefined));
     this.storage.remove(REDIRECT_COOKIE);
   }
 
@@ -546,4 +508,14 @@ export class AuthService {
     return this.getImpersonateID() === epersonId;
   }
 
+  /**
+   * Get a short-lived token for appending to download urls of restricted files
+   * Returns null if the user isn't authenticated
+   */
+  getShortlivedToken(): Observable<string> {
+    return this.isAuthenticated().pipe(
+      switchMap((authenticated) => authenticated ? this.authRequestService.getShortlivedToken() : observableOf(null))
+    );
+  }
+
 }
diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts
index 7a2f39854c5..0b9eeec5095 100644
--- a/src/app/core/auth/authenticated.guard.ts
+++ b/src/app/core/auth/authenticated.guard.ts
@@ -1,21 +1,26 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, CanLoad, Route, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree
+} from '@angular/router';
 
 import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { map, find, switchMap } from 'rxjs/operators';
 import { select, Store } from '@ngrx/store';
 
 import { CoreState } from '../core.reducers';
-import { isAuthenticated } from './selectors';
-import { AuthService } from './auth.service';
-import { RedirectWhenAuthenticationIsRequiredAction } from './auth.actions';
+import { isAuthenticated, isAuthenticationLoading } from './selectors';
+import { AuthService, LOGIN_ROUTE } from './auth.service';
 
 /**
  * Prevent unauthorized activating and loading of routes
  * @class AuthenticatedGuard
  */
 @Injectable()
-export class AuthenticatedGuard implements CanActivate, CanLoad {
+export class AuthenticatedGuard implements CanActivate {
 
   /**
    * @constructor
@@ -24,46 +29,37 @@ export class AuthenticatedGuard implements CanActivate, CanLoad {
 
   /**
    * True when user is authenticated
+   * UrlTree with redirect to login page when user isn't authenticated
    * @method canActivate
    */
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
     const url = state.url;
     return this.handleAuth(url);
   }
 
   /**
    * True when user is authenticated
+   * UrlTree with redirect to login page when user isn't authenticated
    * @method canActivateChild
    */
-  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
     return this.canActivate(route, state);
   }
 
-  /**
-   * True when user is authenticated
-   * @method canLoad
-   */
-  canLoad(route: Route): Observable<boolean> {
-    const url = `/${route.path}`;
-
-    return this.handleAuth(url);
-  }
-
-  private handleAuth(url: string): Observable<boolean> {
-    // get observable
-    const observable = this.store.pipe(select(isAuthenticated));
-
+  private handleAuth(url: string): Observable<boolean | UrlTree> {
     // redirect to sign in page if user is not authenticated
-    observable.pipe(
-      // .filter(() => isEmpty(this.router.routerState.snapshot.url) || this.router.routerState.snapshot.url === url)
-      take(1))
-      .subscribe((authenticated) => {
-        if (!authenticated) {
+    return this.store.pipe(select(isAuthenticationLoading)).pipe(
+      find((isLoading: boolean) => isLoading === false),
+      switchMap(() => this.store.pipe(select(isAuthenticated))),
+      map((authenticated) => {
+        if (authenticated) {
+          return authenticated;
+        } else {
           this.authService.setRedirectUrl(url);
-          this.store.dispatch(new RedirectWhenAuthenticationIsRequiredAction('Login required'));
+          this.authService.removeToken();
+          return this.router.createUrlTree([LOGIN_ROUTE]);
         }
-    });
-
-    return observable;
+      })
+    );
   }
 }
diff --git a/src/app/core/auth/models/short-lived-token.model.ts b/src/app/core/auth/models/short-lived-token.model.ts
new file mode 100644
index 00000000000..e51f35fd588
--- /dev/null
+++ b/src/app/core/auth/models/short-lived-token.model.ts
@@ -0,0 +1,35 @@
+import { CacheableObject } from '../../cache/object-cache.reducer';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { autoserialize, deserialize, autoserializeAs } from 'cerialize';
+import { ResourceType } from '../../shared/resource-type';
+import { SHORT_LIVED_TOKEN } from './short-lived-token.resource-type';
+import { HALLink } from '../../shared/hal-link.model';
+
+/**
+ * A short-lived token that can be used to authenticate a rest request
+ */
+@typedObject
+export class ShortLivedToken implements CacheableObject {
+  static type = SHORT_LIVED_TOKEN;
+  /**
+   * The type for this ShortLivedToken
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The value for this ShortLivedToken
+   */
+  @autoserializeAs('token')
+  value: string;
+
+  /**
+   * The {@link HALLink}s for this ShortLivedToken
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+  };
+}
diff --git a/src/app/core/auth/models/short-lived-token.resource-type.ts b/src/app/core/auth/models/short-lived-token.resource-type.ts
new file mode 100644
index 00000000000..608c1aca4ed
--- /dev/null
+++ b/src/app/core/auth/models/short-lived-token.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for ShortLivedToken
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SHORT_LIVED_TOKEN = new ResourceType('shortlivedtoken');
diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts
index 173f82e810a..c4e95a0fb32 100644
--- a/src/app/core/auth/selectors.ts
+++ b/src/app/core/auth/selectors.ts
@@ -65,6 +65,14 @@ const _getAuthenticationInfo = (state: AuthState) => state.info;
  */
 const _isLoading = (state: AuthState) => state.loading;
 
+/**
+ * Returns true if everything else should wait for authentication.
+ * @function _isBlocking
+ * @param {State} state
+ * @returns {boolean}
+ */
+const _isBlocking = (state: AuthState) => state.blocking;
+
 /**
  * Returns true if a refresh token request is in progress.
  * @function _isRefreshing
@@ -170,6 +178,16 @@ export const isAuthenticatedLoaded = createSelector(getAuthState, _isAuthenticat
  */
 export const isAuthenticationLoading = createSelector(getAuthState, _isLoading);
 
+/**
+ * Returns true if the authentication should block everything else
+ *
+ * @function isAuthenticationBlocking
+ * @param {AuthState} state
+ * @param {any} props
+ * @return {boolean}
+ */
+export const isAuthenticationBlocking = createSelector(getAuthState, _isBlocking);
+
 /**
  * Returns true if the refresh token request is loading.
  * @function isTokenRefreshing
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index 30767be85a9..9840b22267c 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -2,13 +2,14 @@ import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
 
 import { Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
-import { isNotEmpty } from '../../shared/empty.util';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { isNotEmpty, hasValue } from '../../shared/empty.util';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { AuthService } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
+import { RemoteData } from '../data/remote-data';
 
 /**
  * The auth service.
@@ -27,14 +28,12 @@ export class ServerAuthService extends AuthService {
 
     headers = headers.append('Accept', 'application/json');
     headers = headers.append('Authorization', `Bearer ${token.accessToken}`);
-    // NB this is used to pass server client IP check.
-    const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress;
-    headers = headers.append('X-Forwarded-For', clientIp);
 
     options.headers = headers;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((status: AuthStatus) => {
-        if (status.authenticated) {
+      map((rd: RemoteData<AuthStatus>) => {
+        const status = rd.payload;
+        if (hasValue(status) && status.authenticated) {
           return status._links.eperson.href;
         } else {
           throw(new Error('Not authenticated'));
@@ -58,35 +57,7 @@ export class ServerAuthService extends AuthService {
     options.headers = headers;
     options.withCredentials = true;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((status: AuthStatus) => Object.assign(new AuthStatus(), status))
+      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
     );
   }
-
-  /**
-   * Redirect to the route navigated before the login
-   */
-  public redirectAfterLoginSuccess(isStandalonePage: boolean) {
-    this.getRedirectUrl().pipe(
-      take(1))
-      .subscribe((redirectUrl) => {
-        if (isNotEmpty(redirectUrl)) {
-          // override the route reuse strategy
-          this.router.routeReuseStrategy.shouldReuseRoute = () => {
-            return false;
-          };
-          this.router.navigated = false;
-          const url = decodeURIComponent(redirectUrl);
-          this.router.navigateByUrl(url);
-        } else {
-          // If redirectUrl is empty use history. For ssr the history array should contain the requested url.
-          this.routeService.getHistory().pipe(
-            filter((history) => history.length > 0),
-            take(1)
-          ).subscribe((history) => {
-            this.navigateToRedirectUrl(history[history.length - 1] || '');
-          });
-        }
-      })
-  }
-
 }
diff --git a/src/app/core/auth/token-response-parsing.service.spec.ts b/src/app/core/auth/token-response-parsing.service.spec.ts
new file mode 100644
index 00000000000..a440325560a
--- /dev/null
+++ b/src/app/core/auth/token-response-parsing.service.spec.ts
@@ -0,0 +1,45 @@
+import { TokenResponseParsingService } from './token-response-parsing.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { TokenResponse } from '../cache/response.models';
+
+describe('TokenResponseParsingService', () => {
+  let service: TokenResponseParsingService;
+
+  beforeEach(() => {
+    service = new TokenResponseParsingService();
+  });
+
+  describe('parse', () => {
+    it('should return a TokenResponse containing the token', () => {
+      const data = {
+        payload: {
+          token: 'valid-token'
+        },
+        statusCode: 200,
+        statusText: 'OK'
+      } as RawRestResponse;
+      const expected = new TokenResponse(data.payload.token, true, 200, 'OK');
+      expect(service.parse(undefined, data)).toEqual(expected);
+    });
+
+    it('should return an empty TokenResponse when payload doesn\'t contain a token', () => {
+      const data = {
+        payload: {},
+        statusCode: 200,
+        statusText: 'OK'
+      } as RawRestResponse;
+      const expected = new TokenResponse(null, false, 200, 'OK');
+      expect(service.parse(undefined, data)).toEqual(expected);
+    });
+
+    it('should return an error TokenResponse when the response failed', () => {
+      const data = {
+        payload: {},
+        statusCode: 400,
+        statusText: 'BAD REQUEST'
+      } as RawRestResponse;
+      const expected = new TokenResponse(null, false, 400, 'BAD REQUEST');
+      expect(service.parse(undefined, data)).toEqual(expected);
+    });
+  });
+});
diff --git a/src/app/core/auth/token-response-parsing.service.ts b/src/app/core/auth/token-response-parsing.service.ts
new file mode 100644
index 00000000000..30abe01c878
--- /dev/null
+++ b/src/app/core/auth/token-response-parsing.service.ts
@@ -0,0 +1,23 @@
+import { ResponseParsingService } from '../data/parsing.service';
+import { RestRequest } from '../data/request.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { RestResponse, TokenResponse } from '../cache/response.models';
+import { isNotEmpty } from '../../shared/empty.util';
+import { Injectable } from '@angular/core';
+
+@Injectable()
+/**
+ * A ResponseParsingService used to parse RawRestResponse coming from the REST API to a token string
+ * wrapped in a TokenResponse
+ */
+export class TokenResponseParsingService implements ResponseParsingService {
+
+  parse(request: RestRequest, data: RawRestResponse): RestResponse {
+    if (isNotEmpty(data.payload) && isNotEmpty(data.payload.token) && (data.statusCode === 200)) {
+      return new TokenResponse(data.payload.token, true, data.statusCode, data.statusText);
+    } else {
+      return new TokenResponse(null, false, data.statusCode, data.statusText)
+    }
+  }
+
+}
diff --git a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
index 7384a031dbd..80d75636377 100644
--- a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
@@ -8,7 +8,9 @@ import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-con
 /**
  * The class that resolves the BreadcrumbConfig object for a Collection
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class CollectionBreadcrumbResolver extends DSOBreadcrumbResolver<Collection> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: CollectionDataService) {
     super(breadcrumbService, dataService);
diff --git a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
index d1f21455f25..298d69133f9 100644
--- a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
@@ -8,7 +8,9 @@ import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-con
 /**
  * The class that resolves the BreadcrumbConfig object for a Community
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class CommunityBreadcrumbResolver extends DSOBreadcrumbResolver<Community> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: CommunityDataService) {
     super(breadcrumbService, dataService);
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
index 80e68a16f5c..49c7aed3657 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
@@ -3,17 +3,20 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 import { DataService } from '../data/data.service';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../shared/operators';
+import { getRemoteDataPayload, getFirstCompletedRemoteData } from '../shared/operators';
 import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { ChildHALResource } from '../shared/child-hal-resource.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export abstract class DSOBreadcrumbResolver<T extends ChildHALResource & DSpaceObject> implements Resolve<BreadcrumbConfig<T>> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: DataService<T>) {
   }
@@ -26,13 +29,17 @@ export abstract class DSOBreadcrumbResolver<T extends ChildHALResource & DSpaceO
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<T>> {
     const uuid = route.params.id;
-    return this.dataService.findById(uuid, ...this.followLinks).pipe(
-      getSucceededRemoteData(),
+    return this.dataService.findById(uuid, false, ...this.followLinks).pipe(
+      getFirstCompletedRemoteData(),
       getRemoteDataPayload(),
       map((object: T) => {
-        const fullPath = state.url;
-        const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
-        return { provider: this.breadcrumbService, key: object, url: url };
+        if (hasValue(object)) {
+          const fullPath = state.url;
+          const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
+          return {provider: this.breadcrumbService, key: object, url: url};
+        } else {
+          return undefined;
+        }
       })
     );
   }
diff --git a/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts b/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
index 5c31e403626..4bd7560e022 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
@@ -10,8 +10,8 @@ import { Community } from '../shared/community.model';
 import { Collection } from '../shared/collection.model';
 import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
 import { getTestScheduler } from 'jasmine-marbles';
-import { getDSOPath } from '../../app-routing.module';
 import { DSONameService } from './dso-name.service';
+import { getDSORoute } from '../../app-routing-paths';
 
 describe('DSOBreadcrumbsService', () => {
   let service: DSOBreadcrumbsService;
@@ -108,9 +108,9 @@ describe('DSOBreadcrumbsService', () => {
     it('should return the breadcrumbs based on an Item', () => {
       const breadcrumbs = service.getBreadcrumbs(testItem, testItem._links.self);
       const expectedCrumbs = [
-        new Breadcrumb(getName(testCommunity), getDSOPath(testCommunity)),
-        new Breadcrumb(getName(testCollection), getDSOPath(testCollection)),
-        new Breadcrumb(getName(testItem), getDSOPath(testItem)),
+        new Breadcrumb(getName(testCommunity), getDSORoute(testCommunity)),
+        new Breadcrumb(getName(testCollection), getDSORoute(testCollection)),
+        new Breadcrumb(getName(testItem), getDSORoute(testItem)),
       ];
       getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: expectedCrumbs });
     })
diff --git a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
index 3cb73be8763..fc1bb9e770e 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
@@ -7,15 +7,17 @@ import { LinkService } from '../cache/builders/link.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { find, map, switchMap } from 'rxjs/operators';
-import { getDSOPath } from '../../app-routing.module';
 import { RemoteData } from '../data/remote-data';
 import { hasValue } from '../../shared/empty.util';
 import { Injectable } from '@angular/core';
+import { getDSORoute } from '../../app-routing-paths';
 
 /**
  * Service to calculate DSpaceObject breadcrumbs for a single part of the route
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class DSOBreadcrumbsService implements BreadcrumbsService<ChildHALResource & DSpaceObject> {
   constructor(
     private linkService: LinkService,
@@ -39,7 +41,7 @@ export class DSOBreadcrumbsService implements BreadcrumbsService<ChildHALResourc
       switchMap((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => {
         if (hasValue(parentRD.payload)) {
           const parent = parentRD.payload;
-          return this.getBreadcrumbs(parent, getDSOPath(parent))
+          return this.getBreadcrumbs(parent, getDSORoute(parent))
         }
         return observableOf([]);
 
diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts
index 161c4f72542..5567137334a 100644
--- a/src/app/core/breadcrumbs/dso-name.service.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.ts
@@ -28,7 +28,8 @@ export class DSONameService {
       return dso.firstMetadataValue('organization.legalName');
     },
     Default: (dso: DSpaceObject): string => {
-      return dso.firstMetadataValue('dc.title');
+      // If object doesn't have dc.title metadata use name property
+      return dso.firstMetadataValue('dc.title') || dso.name;
     }
   };
 
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
index d34d6d8a9b8..6b640a9db0d 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
@@ -1,21 +1,38 @@
 import { I18nBreadcrumbResolver } from './i18n-breadcrumb.resolver';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 describe('I18nBreadcrumbResolver', () => {
   describe('resolve', () => {
     let resolver: I18nBreadcrumbResolver;
     let i18nBreadcrumbService: any;
     let i18nKey: string;
-    let path: string;
+    let route: any;
+    let parentSegment;
+    let segment;
+    let expectedPath;
     beforeEach(() => {
       i18nKey = 'example.key';
-      path = 'rest.com/path/to/breadcrumb';
+      parentSegment = 'path';
+      segment = 'breadcrumb';
+      route = {
+        data: { breadcrumbKey: i18nKey },
+        routeConfig: {
+          path: segment
+        },
+        parent: {
+          routeConfig: {
+            path: parentSegment
+          }
+        } as any
+      };
+      expectedPath = new URLCombiner(parentSegment, segment).toString();
       i18nBreadcrumbService = {};
       resolver = new I18nBreadcrumbResolver(i18nBreadcrumbService);
     });
 
     it('should resolve the breadcrumb config', () => {
-      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: i18nKey }, url: [path] } as any, {} as any);
-      const expectedConfig = { provider: i18nBreadcrumbService, key: i18nKey, url: path };
+      const resolvedConfig = resolver.resolve(route, {} as any);
+      const expectedConfig = { provider: i18nBreadcrumbService, key: i18nKey, url: expectedPath };
       expect(resolvedConfig).toEqual(expectedConfig);
     });
 
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
index de7d061a3f9..cce36f590a8 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
@@ -3,11 +3,14 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
 import { hasNoValue } from '../../shared/empty.util';
+import { currentPathFromSnapshot } from '../../shared/utils/route.utils';
 
 /**
  * The class that resolves a BreadcrumbConfig object with an i18n key string for a route
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class I18nBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>> {
   constructor(protected breadcrumbService: I18nBreadcrumbsService) {
   }
@@ -23,7 +26,7 @@ export class I18nBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>>
     if (hasNoValue(key)) {
       throw new Error('You provided an i18nBreadcrumbResolver for url \"' + route.url + '\" but no breadcrumbKey in the route\'s data')
     }
-    const fullPath = route.url.join('');
+    const fullPath = currentPathFromSnapshot(route);
     return { provider: this.breadcrumbService, key: key, url: fullPath };
   }
 }
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
index e07d9ed5417..b774b58126a 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
@@ -11,7 +11,9 @@ export const BREADCRUMB_MESSAGE_POSTFIX = '.breadcrumbs';
 /**
  * Service to calculate i18n breadcrumbs for a single part of the route
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class I18nBreadcrumbsService implements BreadcrumbsService<string> {
 
   /**
diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
index cd0c23cf821..8e13eda01db 100644
--- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
@@ -8,7 +8,9 @@ import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-con
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class ItemBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: ItemDataService) {
     super(breadcrumbService, dataService);
diff --git a/src/app/core/browse/browse-definition-data.service.spec.ts b/src/app/core/browse/browse-definition-data.service.spec.ts
new file mode 100644
index 00000000000..06fea5b8701
--- /dev/null
+++ b/src/app/core/browse/browse-definition-data.service.spec.ts
@@ -0,0 +1,47 @@
+import { BrowseDefinitionDataService } from './browse-definition-data.service';
+import { FindListOptions } from '../data/request.models';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { EMPTY } from 'rxjs';
+
+describe(`BrowseDefinitionDataService`, () => {
+  let service: BrowseDefinitionDataService;
+  const dataServiceImplSpy = jasmine.createSpyObj('dataService', {
+    findAll: EMPTY,
+    findByHref: EMPTY,
+    findAllByHref: EMPTY,
+  });
+  const hrefAll = 'https://rest.api/server/api/discover/browses';
+  const hrefSingle = 'https://rest.api/server/api/discover/browses/author';
+  const options = new FindListOptions();
+  const linksToFollow = [
+    followLink('entries'),
+    followLink('items')
+  ]
+
+  beforeEach(() => {
+    service = new BrowseDefinitionDataService(null, null, null, null, null, null, null, null);
+    (service as any).dataService = dataServiceImplSpy;
+  });
+
+  describe(`findAll`, () => {
+     it(`should call findAll on DataServiceImpl`, () => {
+       service.findAll(options, false, ...linksToFollow);
+       expect(dataServiceImplSpy.findAll).toHaveBeenCalledWith(options, false, ...linksToFollow);
+     });
+  });
+
+  describe(`findByHref`, () => {
+     it(`should call findByHref on DataServiceImpl`, () => {
+       service.findByHref(hrefSingle, false, ...linksToFollow);
+       expect(dataServiceImplSpy.findByHref).toHaveBeenCalledWith(hrefSingle, false, ...linksToFollow);
+     });
+  });
+
+  describe(`findAllByHref`, () => {
+     it(`should call findAllByHref on DataServiceImpl`, () => {
+       service.findAllByHref(hrefAll, options, false, ...linksToFollow);
+       expect(dataServiceImplSpy.findAllByHref).toHaveBeenCalledWith(hrefAll, options, false, ...linksToFollow);
+     });
+  });
+
+});
diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
new file mode 100644
index 00000000000..2bd88c12f91
--- /dev/null
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -0,0 +1,105 @@
+import { Injectable } from '@angular/core';
+import { dataService } from '../cache/builders/build-decorators';
+import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
+import { DataService } from '../data/data.service';
+import { BrowseDefinition } from '../shared/browse-definition.model';
+import { RequestService } from '../data/request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../data/remote-data';
+import { FindListOptions } from '../data/request.models';
+import { PaginatedList } from '../data/paginated-list.model';
+
+/* tslint:disable:max-classes-per-file */
+
+class DataServiceImpl extends DataService<BrowseDefinition> {
+  protected linkPath = 'browses';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<BrowseDefinition>) {
+    super();
+  }
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+@dataService(BROWSE_DEFINITION)
+export class BrowseDefinitionDataService {
+  /**
+   * A private DataService instance to delegate specific methods to.
+   */
+  private dataService: DataServiceImpl;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<BrowseDefinition>) {
+    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+  }
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options           Find list options object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<BrowseDefinition>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<BrowseDefinition>>): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return this.dataService.findAll(options, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns an observable of {@link RemoteData} of an {@link BrowseDefinition}, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the {@link BrowseDefinition}
+   * @param href              The url of {@link BrowseDefinition} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
+   */
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<BrowseDefinition>>): Observable<RemoteData<BrowseDefinition>> {
+    return this.dataService.findByHref(href, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns a list of observables of {@link RemoteData} of {@link BrowseDefinition}s, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the {@link BrowseDefinition}
+   * @param href              The url of the {@link BrowseDefinition} we want to retrieve
+   * @param findListOptions   Find list options object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
+   */
+  findAllByHref(href: string, findListOptions: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<BrowseDefinition>>): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return this.dataService.findAllByHref(href, findListOptions, reRequestOnStale, ...linksToFollow);
+  }
+}
+
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index 58796636e2c..790f260d5d2 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -5,12 +5,14 @@ import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-bu
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { BrowseEndpointRequest, BrowseEntriesRequest, BrowseItemsRequest } from '../data/request.models';
 import { RequestEntry } from '../data/request.reducer';
 import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from '../shared/browse-definition.model';
 import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 import { BrowseService } from './browse.service';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { GetRequest } from '../data/request.models';
 
 describe('BrowseService', () => {
   let scheduler: TestScheduler;
@@ -79,6 +81,8 @@ describe('BrowseService', () => {
     })
   ];
 
+  let browseDefinitionDataService;
+
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
       response: { isSuccessful: successful, payload: browseDefinitions } as any
@@ -86,9 +90,13 @@ describe('BrowseService', () => {
   };
 
   function initTestService() {
+    browseDefinitionDataService = jasmine.createSpyObj('browseDefinitionDataService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(browseDefinitions))
+    });
     return new BrowseService(
       requestService,
       halService,
+      browseDefinitionDataService,
       rdbService
     );
   }
@@ -105,35 +113,14 @@ describe('BrowseService', () => {
       service = initTestService();
       spyOn(halService, 'getEndpoint').and
         .returnValue(hot('--a-', { a: browsesEndpointURL }));
-      spyOn(rdbService, 'toRemoteDataObservable').and.callThrough();
-    });
-
-    it('should configure a new BrowseEndpointRequest', () => {
-      const expected = new BrowseEndpointRequest(requestService.generateRequestId(), browsesEndpointURL);
-
-      scheduler.schedule(() => service.getBrowseDefinitions().subscribe());
-      scheduler.flush();
-
-      expect(requestService.configure).toHaveBeenCalledWith(expected);
+      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
-    it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
+    it('should call BrowseDefinitionDataService to create the RemoteData Observable', () => {
       service.getBrowseDefinitions();
+      expect(browseDefinitionDataService.findAll).toHaveBeenCalled();
 
-      expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
-
-    });
-
-    it('should return a RemoteData object containing the correct BrowseDefinition[]', () => {
-      const expected = cold('--a-', {
-        a: {
-          payload: browseDefinitions
-        }
-      });
-
-      expect(service.getBrowseDefinitions()).toBeObservable(expected);
     });
-
   });
 
   describe('getBrowseEntriesFor and getBrowseItemsFor', () => {
@@ -145,16 +132,14 @@ describe('BrowseService', () => {
       service = initTestService();
       spyOn(service, 'getBrowseDefinitions').and
         .returnValue(hot('--a-', {
-          a: {
-            payload: browseDefinitions
-          }
+          a: createSuccessfulRemoteDataObject(createPaginatedList(browseDefinitions))
         }));
-      spyOn(rdbService, 'toRemoteDataObservable').and.callThrough();
+      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     describe('when getBrowseEntriesFor is called with a valid browse definition id', () => {
       it('should configure a new BrowseEntriesRequest', () => {
-        const expected = new BrowseEntriesRequest(requestService.generateRequestId(), browseDefinitions[1]._links.entries.href);
+        const expected = new GetRequest(requestService.generateRequestId(), browseDefinitions[1]._links.entries.href);
 
         scheduler.schedule(() => service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
@@ -165,7 +150,7 @@ describe('BrowseService', () => {
       it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
         service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id));
 
-        expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
+        expect(rdbService.buildList).toHaveBeenCalled();
 
       });
 
@@ -173,7 +158,7 @@ describe('BrowseService', () => {
 
     describe('when getBrowseItemsFor is called with a valid browse definition id', () => {
       it('should configure a new BrowseItemsRequest', () => {
-        const expected = new BrowseItemsRequest(requestService.generateRequestId(), browseDefinitions[1]._links.items.href + '?filterValue=' + mockAuthorName);
+        const expected = new GetRequest(requestService.generateRequestId(), browseDefinitions[1]._links.items.href + '?filterValue=' + mockAuthorName);
 
         scheduler.schedule(() => service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
@@ -184,31 +169,11 @@ describe('BrowseService', () => {
       it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
         service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(browseDefinitions[1].id));
 
-        expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
+        expect(rdbService.buildList).toHaveBeenCalled();
 
       });
 
     });
-
-    describe('when getBrowseEntriesFor is called with an invalid browse definition id', () => {
-      it('should throw an Error', () => {
-
-        const definitionID = 'invalidID';
-        const expected = cold('--#-', undefined, new Error(`No metadata browse definition could be found for id '${definitionID}'`));
-
-        expect(service.getBrowseEntriesFor(new BrowseEntrySearchOptions(definitionID))).toBeObservable(expected);
-      });
-    });
-
-    describe('when getBrowseItemsFor is called with an invalid browse definition id', () => {
-      it('should throw an Error', () => {
-
-        const definitionID = 'invalidID';
-        const expected = cold('--#-', undefined, new Error(`No metadata browse definition could be found for id '${definitionID}'`))
-
-        expect(service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(definitionID))).toBeObservable(expected);
-      });
-    });
   });
 
   describe('getBrowseURLFor', () => {
@@ -220,9 +185,7 @@ describe('BrowseService', () => {
         service = initTestService();
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('--a-', {
-            a: {
-              payload: browseDefinitions
-            }
+            a: createSuccessfulRemoteDataObject(createPaginatedList(browseDefinitions))
           }));
       });
 
@@ -295,18 +258,16 @@ describe('BrowseService', () => {
       service = initTestService();
       spyOn(service, 'getBrowseDefinitions').and
         .returnValue(hot('--a-', {
-          a: {
-            payload: browseDefinitions
-          }
+          a: createSuccessfulRemoteDataObject(createPaginatedList(browseDefinitions))
         }));
-      spyOn(rdbService, 'toRemoteDataObservable').and.callThrough();
+      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     describe('when getFirstItemFor is called with a valid browse definition id', () => {
       const expectedURL = browseDefinitions[1]._links.items.href + '?page=0&size=1';
 
       it('should configure a new BrowseItemsRequest', () => {
-        const expected = new BrowseItemsRequest(requestService.generateRequestId(), expectedURL);
+        const expected = new GetRequest(requestService.generateRequestId(), expectedURL);
 
         scheduler.schedule(() => service.getFirstItemFor(browseDefinitions[1].id).subscribe());
         scheduler.flush();
@@ -317,7 +278,7 @@ describe('BrowseService', () => {
       it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
         service.getFirstItemFor(browseDefinitions[1].id);
 
-        expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
+        expect(rdbService.buildList).toHaveBeenCalled();
       });
 
     });
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 78e63e8540c..fb52cd8d058 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -1,35 +1,26 @@
 import { Injectable } from '@angular/core';
 import { Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged, map, startWith } from 'rxjs/operators';
-import {
-  ensureArrayHasValue,
-  hasValue,
-  hasValueOperator,
-  isEmpty,
-  isNotEmpty,
-  isNotEmptyOperator
-} from '../../shared/empty.util';
+import { distinctUntilChanged, map, startWith, take } from 'rxjs/operators';
+import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { GenericSuccessResponse } from '../cache/response.models';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { BrowseEndpointRequest, BrowseEntriesRequest, BrowseItemsRequest, RestRequest } from '../data/request.models';
+import { GetRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from '../shared/browse-definition.model';
 import { BrowseEntry } from '../shared/browse-entry.model';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import {
-  configureRequest,
-  filterSuccessfulResponses,
   getBrowseDefinitionLinks,
   getFirstOccurrence,
   getRemoteDataPayload,
-  getRequestFromRequestHref
+  getFirstSucceededRemoteData,
+  getPaginatedListPayload
 } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
+import { BrowseDefinitionDataService } from './browse-definition-data.service';
 
 /**
  * The service handling all browse requests
@@ -54,6 +45,7 @@ export class BrowseService {
   constructor(
     protected requestService: RequestService,
     protected halService: HALEndpointService,
+    private browseDefinitionDataService: BrowseDefinitionDataService,
     private rdb: RemoteDataBuildService,
   ) {
   }
@@ -61,27 +53,11 @@ export class BrowseService {
   /**
    * Get all BrowseDefinitions
    */
-  getBrowseDefinitions(): Observable<RemoteData<BrowseDefinition[]>> {
-    const request$ = this.halService.getEndpoint(this.linkPath).pipe(
-      isNotEmptyOperator(),
-      distinctUntilChanged(),
-      map((endpointURL: string) => new BrowseEndpointRequest(this.requestService.generateRequestId(), endpointURL)),
-      configureRequest(this.requestService)
-    );
-
-    const href$ = request$.pipe(map((request: RestRequest) => request.href));
-    const requestEntry$ = href$.pipe(getRequestFromRequestHref(this.requestService));
-    const payload$ = requestEntry$.pipe(
-      filterSuccessfulResponses(),
-      map((response: GenericSuccessResponse<BrowseDefinition[]>) => response.payload),
-      ensureArrayHasValue(),
-      map((definitions: BrowseDefinition[]) => definitions
-        .map((definition: BrowseDefinition) => {
-          return Object.assign(new BrowseDefinition(), definition)
-        })),
-      distinctUntilChanged(),
+  getBrowseDefinitions(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    // TODO properly support pagination
+    return this.browseDefinitionDataService.findAll({ elementsPerPage: 9999 }).pipe(
+      getFirstSucceededRemoteData(),
     );
-    return this.rdb.toRemoteDataObservable(requestEntry$, payload$);
   }
 
   /**
@@ -191,6 +167,7 @@ export class BrowseService {
         return href;
       }),
       getBrowseItemsFor(this.requestService, this.rdb),
+      getFirstSucceededRemoteData(),
       getFirstOccurrence()
     );
   }
@@ -244,6 +221,7 @@ export class BrowseService {
     const searchKeyArray = BrowseService.toSearchKeyArray(metadataKey);
     return this.getBrowseDefinitions().pipe(
       getRemoteDataPayload(),
+      getPaginatedListPayload(),
       map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
         .find((def: BrowseDefinition) => {
           const matchingKeys = def.metadataKeys.find((key: string) => searchKeyArray.indexOf(key) >= 0);
@@ -271,71 +249,31 @@ export class BrowseService {
  * @param rdb
  */
 export const getBrowseEntriesFor = (requestService: RequestService, rdb: RemoteDataBuildService) =>
-  (source: Observable<string>): Observable<RemoteData<PaginatedList<BrowseEntry>>> =>
-    source.pipe(
-      map((href: string) => new BrowseEntriesRequest(requestService.generateRequestId(), href)),
-      configureRequest(requestService),
-      toRDPaginatedBrowseEntries(requestService, rdb)
-    );
+  (source: Observable<string>): Observable<RemoteData<PaginatedList<BrowseEntry>>> => {
+    const requestId = requestService.generateRequestId();
 
-/**
- * Operator for turning a href into a PaginatedList of Items
- * @param requestService
- * @param responseCache
- * @param rdb
- */
-export const getBrowseItemsFor = (requestService: RequestService, rdb: RemoteDataBuildService) =>
-  (source: Observable<string>): Observable<RemoteData<PaginatedList<Item>>> =>
-    source.pipe(
-      map((href: string) => new BrowseItemsRequest(requestService.generateRequestId(), href)),
-      configureRequest(requestService),
-      toRDPaginatedBrowseItems(requestService, rdb)
-    );
+    source.pipe(take(1)).subscribe((href: string) => {
+      const request = new GetRequest(requestId, href);
+      requestService.configure(request);
+    })
 
-/**
- * Operator for turning a RestRequest into a PaginatedList of Items
- * @param requestService
- * @param responseCache
- * @param rdb
- */
-export const toRDPaginatedBrowseItems = (requestService: RequestService, rdb: RemoteDataBuildService) =>
-  (source: Observable<RestRequest>): Observable<RemoteData<PaginatedList<Item>>> => {
-    const href$ = source.pipe(map((request: RestRequest) => request.href));
-
-    const requestEntry$ = href$.pipe(getRequestFromRequestHref(requestService));
-
-    const payload$ = requestEntry$.pipe(
-      filterSuccessfulResponses(),
-      map((response: GenericSuccessResponse<Item[]>) => new PaginatedList(response.pageInfo, response.payload)),
-      map((list: PaginatedList<Item>) => Object.assign(list, {
-        page: list.page ? list.page.map((item: DSpaceObject) => Object.assign(new Item(), item)) : list.page
-      })),
-      distinctUntilChanged()
-    );
-
-    return rdb.toRemoteDataObservable(requestEntry$, payload$);
+    return rdb.buildList(source);
   };
 
 /**
- * Operator for turning a RestRequest into a PaginatedList of BrowseEntries
+ * Operator for turning a href into a PaginatedList of Items
  * @param requestService
  * @param responseCache
  * @param rdb
  */
-export const toRDPaginatedBrowseEntries = (requestService: RequestService, rdb: RemoteDataBuildService) =>
-  (source: Observable<RestRequest>): Observable<RemoteData<PaginatedList<BrowseEntry>>> => {
-    const href$ = source.pipe(map((request: RestRequest) => request.href));
-
-    const requestEntry$ = href$.pipe(getRequestFromRequestHref(requestService));
+export const getBrowseItemsFor = (requestService: RequestService, rdb: RemoteDataBuildService) =>
+  (source: Observable<string>): Observable<RemoteData<PaginatedList<Item>>> => {
+    const requestId = requestService.generateRequestId();
 
-    const payload$ = requestEntry$.pipe(
-      filterSuccessfulResponses(),
-      map((response: GenericSuccessResponse<BrowseEntry[]>) => new PaginatedList(response.pageInfo, response.payload)),
-      map((list: PaginatedList<BrowseEntry>) => Object.assign(list, {
-        page: list.page ? list.page.map((entry: BrowseEntry) => Object.assign(new BrowseEntry(), entry)) : list.page
-      })),
-      distinctUntilChanged()
-    );
+    source.pipe(take(1)).subscribe((href: string) => {
+      const request = new GetRequest(requestId, href);
+      requestService.configure(request);
+    })
 
-    return rdb.toRemoteDataObservable(requestEntry$, payload$);
+    return rdb.buildList(source);
   };
diff --git a/src/app/core/cache/builders/build-decorators.ts b/src/app/core/cache/builders/build-decorators.ts
index 06a955cb00c..af4c4fdf36f 100644
--- a/src/app/core/cache/builders/build-decorators.ts
+++ b/src/app/core/cache/builders/build-decorators.ts
@@ -3,7 +3,11 @@ import { hasNoValue, hasValue } from '../../../shared/empty.util';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
-import { CacheableObject, TypedObject } from '../object-cache.reducer';
+import {
+  CacheableObject,
+  TypedObject,
+  getResourceTypeValueFor
+} from '../object-cache.reducer';
 
 const resolvedLinkKey = Symbol('resolvedLink');
 
@@ -14,9 +18,9 @@ const linkMap = new Map();
 
 /**
  * Decorator function to map a ResourceType to its class
- * @param target The contructor of the typed class to map
+ * @param target the typed class to map
  */
-export function typedObject(target: typeof TypedObject) {
+export function typedObject(target: TypedObject) {
   typeMap.set(target.type.value, target);
 }
 
@@ -25,10 +29,7 @@ export function typedObject(target: typeof TypedObject) {
  * @param type The resource type
  */
 export function getClassForType(type: string | ResourceType) {
-  if (typeof(type) === 'object') {
-    type = (type as ResourceType).value;
-  }
-  return typeMap.get(type);
+  return typeMap.get(getResourceTypeValueFor(type));
 }
 
 /**
diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index 95a7570207a..b7db0ebb305 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -6,7 +6,6 @@ import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
 import * as decorators from './build-decorators';
-import { getDataServiceFor } from './build-decorators';
 import { LinkService } from './link.service';
 
 const spyOnFunction = <T>(obj: T, func: keyof T) => {
@@ -39,10 +38,10 @@ class TestModel implements HALResource {
 
 @Injectable()
 class TestDataService {
-  findAllByHref(href: string, findListOptions: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<any>>) {
+  findAllByHref(href: string, findListOptions: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<any>>) {
     return 'findAllByHref';
   }
-  findByHref(href: string, ...linksToFollow: Array<FollowLinkConfig<any>>) {
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<any>>) {
     return 'findByHref';
   }
 }
@@ -93,7 +92,7 @@ describe('LinkService', () => {
         service.resolveLink(testModel, followLink('predecessor', {}, true, followLink('successor')))
       });
       it('should call dataservice.findByHref with the correct href and nested links', () => {
-        expect(testDataService.findByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, followLink('successor'));
+        expect(testDataService.findByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, true, followLink('successor'));
       });
     });
     describe(`when the linkdefinition concerns a list`, () => {
@@ -108,7 +107,7 @@ describe('LinkService', () => {
         service.resolveLink(testModel, followLink('predecessor', { some: 'options '} as any, true, followLink('successor')))
       });
       it('should call dataservice.findAllByHref with the correct href, findListOptions,  and nested links', () => {
-        expect(testDataService.findAllByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, { some: 'options '} as any, followLink('successor'));
+        expect(testDataService.findAllByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, { some: 'options '} as any, true, followLink('successor'));
       });
     });
     describe('either way', () => {
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index dc65eab68fd..e5f1d50b797 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -27,7 +27,7 @@ export class LinkService {
    */
   public resolveLinks<T extends HALResource>(model: T, ...linksToFollow: Array<FollowLinkConfig<T>>): T {
     linksToFollow.forEach((linkToFollow: FollowLinkConfig<T>) => {
-      this.resolveLink(model, linkToFollow);
+        this.resolveLink(model, linkToFollow);
     });
     return model;
   }
@@ -61,12 +61,13 @@ export class LinkService {
 
         try {
           if (matchingLinkDef.isList) {
-            model[linkToFollow.name] = service.findAllByHref(href, linkToFollow.findListOptions, ...linkToFollow.linksToFollow);
+            model[linkToFollow.name] = service.findAllByHref(href, linkToFollow.findListOptions, true, ...linkToFollow.linksToFollow);
           } else {
-            model[linkToFollow.name] = service.findByHref(href, ...linkToFollow.linksToFollow);
+            model[linkToFollow.name] = service.findByHref(href, true, ...linkToFollow.linksToFollow);
           }
         } catch (e) {
-          throw new Error(`Something went wrong when using @dataService(${matchingLinkDef.resourceType.value}) ${hasValue(service) ? '' : '(undefined) '}to resolve link ${linkToFollow.name} from ${href}`);
+          console.error(`Something went wrong when using @dataService(${matchingLinkDef.resourceType.value}) ${hasValue(service) ? '' : '(undefined) '}to resolve link ${linkToFollow.name} at ${href}`);
+          throw e;
         }
       }
     }
diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index 8bf689d7943..da7681d587e 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -1,63 +1,647 @@
-import { of as observableOf } from 'rxjs';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { PaginatedList } from '../../data/paginated-list';
-import { RemoteData } from '../../data/remote-data';
+import { buildPaginatedList, PaginatedList } from '../../data/paginated-list.model';
 import { Item } from '../../shared/item.model';
 import { PageInfo } from '../../shared/page-info.model';
 import { RemoteDataBuildService } from './remote-data-build.service';
-
-const pageInfo = new PageInfo();
-const array = [
-  Object.assign(new Item(), {
-    metadata: {
-      'dc.title': [
-        {
-          language: 'en_US',
-          value: 'Item nr 1'
-        }
-      ]
-    }
-  }),
-  Object.assign(new Item(), {
-    metadata: {
-      'dc.title': [
-        {
-          language: 'en_US',
-          value: 'Item nr 2'
-        }
-      ]
-    }
-  })
-];
-const paginatedList = new PaginatedList(pageInfo, array);
-const arrayRD = createSuccessfulRemoteDataObject(array);
-const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+import { ObjectCacheService } from '../object-cache.service';
+import { ITEM } from '../../shared/item.resource-type';
+import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { getMockObjectCacheService } from '../../../shared/mocks/object-cache.service.mock';
+import { LinkService } from './link.service';
+import { RequestService } from '../../data/request.service';
+import { UnCacheableObject } from '../../shared/uncacheable-object.model';
+import { RemoteData } from '../../data/remote-data';
+import { Observable, of as observableOf } from 'rxjs';
+import { RequestEntry, RequestEntryState } from '../../data/request.reducer';
+import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
+import { take } from 'rxjs/operators';
+import { HALLink } from '../../shared/hal-link.model';
 
 describe('RemoteDataBuildService', () => {
   let service: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let linkService: LinkService;
+  let requestService: RequestService;
+  let unCacheableObject: UnCacheableObject;
+  let pageInfo: PageInfo;
+  let paginatedList: PaginatedList<any>;
+  let normalizedPaginatedList: PaginatedList<any>;
+  let selfLink1: string;
+  let selfLink2: string;
+  let pageLinks: HALLink[];
+  let array: Item[];
+  let arrayRD: RemoteData<any>;
+  let paginatedListRD: RemoteData<PaginatedList<any>>;
+  let requestEntry$: Observable<RequestEntry>;
+  let entrySuccessCacheable: RequestEntry;
+  let entrySuccessUnCacheable: RequestEntry;
+  let entrySuccessNoContent: RequestEntry;
+  let entryError: RequestEntry;
+  let linksToFollow: Array<FollowLinkConfig<any>>;
 
   beforeEach(() => {
-    service = new RemoteDataBuildService(undefined, undefined, undefined);
+    objectCache = getMockObjectCacheService();
+    linkService = getMockLinkService();
+    requestService = getMockRequestService();
+    unCacheableObject = {
+      foo: 'bar'
+    }
+    pageInfo = new PageInfo();
+    selfLink1 = 'https://rest.api/some/object';
+    selfLink2 = 'https://rest.api/another/object';
+    pageLinks = [
+      { href: selfLink1 },
+      { href: selfLink2 },
+    ]
+    array = [
+      Object.assign(new Item(), {
+        metadata: {
+          'dc.title': [
+            {
+              language: 'en_US',
+              value: 'Item nr 1'
+            }
+          ]
+        },
+        _links: {
+          self: {
+            href: selfLink1
+          }
+        }
+      }),
+      Object.assign(new Item(), {
+        metadata: {
+          'dc.title': [
+            {
+              language: 'en_US',
+              value: 'Item nr 2'
+            }
+          ]
+        },
+        _links: {
+          self: {
+            href: selfLink2
+          }
+        }
+      })
+    ];
+    paginatedList = buildPaginatedList(pageInfo, array);
+    normalizedPaginatedList = buildPaginatedList(pageInfo, array, true);
+    arrayRD = createSuccessfulRemoteDataObject(array);
+    paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+    entrySuccessCacheable = {
+      request: {
+        uuid: '17820127-0ee5-4ed4-b6da-e654bdff8487'
+      },
+      state: RequestEntryState.Success,
+      response: {
+        statusCode: 200,
+        payloadLink: {
+          href: selfLink1
+        }
+      }
+    } as RequestEntry;
+    entrySuccessUnCacheable = {
+      request: {
+        uuid: '0aa5ec06-d6a7-4e73-952e-1e0462bd1501'
+      },
+      state: RequestEntryState.Success,
+      response: {
+        statusCode: 200,
+        unCacheableObject,
+      }
+    } as RequestEntry;
+    entrySuccessNoContent = {
+      request: {
+        uuid: '780a7295-6102-4a43-9775-80f2a4ff673c'
+      },
+      state: RequestEntryState.Success,
+      response: {
+        statusCode: 204
+      },
+    } as RequestEntry;
+    entryError = {
+      request: {
+        uuid: '1609dcbc-8442-4877-966e-864f151cc40c'
+      },
+      state: RequestEntryState.Error,
+      response: {
+        statusCode: 500,
+      }
+    } as RequestEntry;
+    requestEntry$ = observableOf(entrySuccessCacheable);
+    linksToFollow = [
+      followLink('a'),
+      followLink('b'),
+    ]
+
+    service = new RemoteDataBuildService(objectCache, linkService, requestService);
   });
 
-  describe('when toPaginatedList is called', () => {
-    let expected: RemoteData<PaginatedList<Item>>;
+  describe(`buildPayload`, () => {
+    beforeEach(() => {
+      spyOn(service as any, 'plainObjectToInstance').and.returnValue(unCacheableObject);
+      spyOn(service as any, 'buildPaginatedList').and.returnValue(observableOf(paginatedList));
+      (objectCache.getObjectByHref as jasmine.Spy).and.returnValue(observableOf(array[0]));
+      (linkService.resolveLinks as jasmine.Spy).and.returnValue(array[1]);
+    });
+
+    describe(`when no self link for the object to retrieve is provided`, () => {
+      beforeEach(() => {
+        spyOn(service as any, 'hasExactMatchInObjectCache').and.returnValue(false);
+        spyOn(service as any, 'isCacheablePayload').and.returnValue(true);
+        spyOn(service as any, 'isUnCacheablePayload').and.returnValue(false);
+      });
+
+      it(`should call hasExactMatchInObjectCache with undefined and the requestEntry`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).hasExactMatchInObjectCache).toHaveBeenCalledWith(undefined, entrySuccessCacheable);
+            done();
+          });
+      });
+
+      it(`should call isCacheablePayload with the requestEntry`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).isCacheablePayload).toHaveBeenCalledWith(entrySuccessCacheable);
+            done();
+          });
+      });
+
+      it(`should not call isUnCacheablePayload`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).isUnCacheablePayload).not.toHaveBeenCalled();
+            done();
+          });
+      });
+
+      it(`should call objectCache.getObjectByHref() with the payloadLink from the response`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect(objectCache.getObjectByHref).toHaveBeenCalledWith(entrySuccessCacheable.response.payloadLink.href);
+            done();
+          });
+      });
+
+      it(`should call linkService.resolveLinks with the object from the cache and the linksToFollow`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect(linkService.resolveLinks).toHaveBeenCalledWith(array[0], ...linksToFollow);
+            done();
+          });
+      });
+
+      it(`should return the object returned from linkService.resolveLinks`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe((response) => {
+            expect(response).toEqual(array[1]);
+            done();
+          });
+      });
+
+    });
+
+    describe(`when a self link for the object to retrieve is provided`, () => {
+      beforeEach(() => {
+        spyOn(service as any, 'hasExactMatchInObjectCache').and.returnValue(true);
+        spyOn(service as any, 'isCacheablePayload').and.returnValue(false);
+        spyOn(service as any, 'isUnCacheablePayload').and.returnValue(false);
+      });
+
+      it(`should call hasExactMatchInObjectCache with that self link and the requestEntry`, (done) => {
+        (service as any).buildPayload(requestEntry$, observableOf(selfLink2), ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).hasExactMatchInObjectCache).toHaveBeenCalledWith(selfLink2, entrySuccessCacheable);
+            done();
+          });
+      });
+
+      it(`should call objectCache.getObjectByHref() with that self link`, (done) => {
+        (service as any).buildPayload(requestEntry$, observableOf(selfLink2), ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect(objectCache.getObjectByHref).toHaveBeenCalledWith(selfLink2);
+            done();
+          });
+      });
+
+      it(`should call linkService.resolveLinks with the object from the cache and the linksToFollow`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect(linkService.resolveLinks).toHaveBeenCalledWith(array[0], ...linksToFollow);
+            done();
+          });
+      });
+
+      it(`should return the object returned from linkService.resolveLinks`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe((response) => {
+            expect(response).toEqual(array[1]);
+            done();
+          });
+      });
+    });
+
+    describe(`when the entry contains an uncachable payload`, () => {
+      beforeEach(() => {
+        requestEntry$ = observableOf(entrySuccessUnCacheable);
+        spyOn(service as any, 'hasExactMatchInObjectCache').and.returnValue(false);
+        spyOn(service as any, 'isCacheablePayload').and.returnValue(false);
+        spyOn(service as any, 'isUnCacheablePayload').and.returnValue(true);
+      });
+
+      it(`should call hasExactMatchInObjectCache with undefined and the requestEntry`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).hasExactMatchInObjectCache).toHaveBeenCalledWith(undefined, entrySuccessUnCacheable);
+            done();
+          });
+      });
+
+      it(`should call isCacheablePayload with the requestEntry`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).isCacheablePayload).toHaveBeenCalledWith(entrySuccessUnCacheable);
+            done();
+          });
+      });
+
+      it(`should call isUnCacheablePayload with the requestEntry`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).isUnCacheablePayload).toHaveBeenCalledWith(entrySuccessUnCacheable);
+            done();
+          });
+      });
+
+      it(`should call plainObjectToInstance with the unCacheableObject from the response`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).plainObjectToInstance).toHaveBeenCalledWith(unCacheableObject);
+            done();
+          });
+      });
+
+      it(`should return the uncacheable object from the response`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined)
+          .pipe(take(1))
+          .subscribe((response) => {
+            expect(response).toBe(unCacheableObject);
+            done();
+          });
+      });
+    });
+
+    describe(`when the entry contains a 204 response`, () => {
+      beforeEach(() => {
+        requestEntry$ = observableOf(entrySuccessNoContent);
+        spyOn(service as any, 'hasExactMatchInObjectCache').and.returnValue(false);
+        spyOn(service as any, 'isCacheablePayload').and.returnValue(false);
+        spyOn(service as any, 'isUnCacheablePayload').and.returnValue(false);
+      });
+
+      it(`should return null`, (done) => {
+        (service as any).buildPayload(requestEntry$, observableOf(selfLink2), ...linksToFollow)
+          .pipe(take(1))
+          .subscribe((response) => {
+            expect(response).toBeNull();
+            done();
+          });
+      });
+    });
+
+    describe(`when the entry contains an error`, () => {
+      beforeEach(() => {
+        requestEntry$ = observableOf(entryError);
+        spyOn(service as any, 'hasExactMatchInObjectCache').and.returnValue(false);
+        spyOn(service as any, 'isCacheablePayload').and.returnValue(false);
+        spyOn(service as any, 'isUnCacheablePayload').and.returnValue(false);
+      });
+
+      it(`should return undefined`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined)
+          .pipe(take(1))
+          .subscribe((response) => {
+            expect(response).toBeUndefined();
+            done();
+          });
+      });
+    });
+
+    describe(`when the entry contains a link to a paginated list`, () => {
+      beforeEach(() => {
+        requestEntry$ = observableOf(entrySuccessCacheable);
+        (objectCache.getObjectByHref as jasmine.Spy).and.returnValue(observableOf(paginatedList));
+        spyOn(service as any, 'hasExactMatchInObjectCache').and.returnValue(false);
+        spyOn(service as any, 'isCacheablePayload').and.returnValue(true);
+        spyOn(service as any, 'isUnCacheablePayload').and.returnValue(false);
+      });
+
+      it(`should call buildPaginatedList with the object from the cache and the linksToFollow`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe(() => {
+            expect((service as any).buildPaginatedList).toHaveBeenCalledWith(paginatedList, ...linksToFollow);
+            done();
+          });
+      });
+
+      it(`should return the paginated list`, (done) => {
+        (service as any).buildPayload(requestEntry$, undefined, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe((response) => {
+            expect(response).toEqual(paginatedList);
+            done();
+          });
+      });
+    });
 
+  });
+
+  describe('hasExactMatchInObjectCache', () => {
+    describe('when the object-cache contains the href, and it has a reference to the request id', () => {
+      beforeEach(() => {
+        (objectCache.hasByHref as jasmine.Spy).and.returnValue(true);
+      });
+
+      it('should return true if the href has a value, and the entry has a request with a valid id', () => {
+        expect((service as any).hasExactMatchInObjectCache('href', entrySuccessCacheable)).toEqual(true);
+      });
+
+      it('should return false if the href is undefined', () => {
+        expect((service as any).hasExactMatchInObjectCache(undefined, entrySuccessCacheable)).toEqual(false);
+      });
+
+      it('should return false if the requestEntry is undefined', () => {
+        expect((service as any).hasExactMatchInObjectCache('href', undefined)).toEqual(false);
+      });
+
+      it('should return false if the requestEntry has no request', () => {
+        expect((service as any).hasExactMatchInObjectCache('href', {})).toEqual(false);
+      });
+
+      it(`should return false if the requestEntry's request has no id`, () => {
+        expect((service as any).hasExactMatchInObjectCache('href', { request: {}})).toEqual(false);
+      });
+    });
+
+    describe('when the object-cache doesn\'t contain the href', () => {
+      beforeEach(() => {
+        (objectCache.hasByHref as jasmine.Spy).and.returnValue(false);
+      });
+
+      it('should return false if the href has a value', () => {
+        expect((service as any).hasExactMatchInObjectCache('href')).toEqual(false);
+      });
+
+      it('should return false if the href is undefined', () => {
+        expect((service as any).hasExactMatchInObjectCache(undefined)).toEqual(false);
+      });
+    });
+  });
+
+  describe('isCacheablePayload', () => {
+    let entry;
+
+    describe('when the entry\'s response contains a cacheable payload', () => {
+      beforeEach(() => {
+        entry = {
+          response: {
+            payloadLink: { href: 'payload-link' }
+          }
+        }
+      });
+
+      it('should return true', () => {
+        expect((service as any).isCacheablePayload(entry)).toEqual(true);
+      });
+    });
+
+    describe('when the entry\'s response doesn\'t contain a cacheable payload', () => {
+      beforeEach(() => {
+        entry = {
+          response: {
+            payloadLink: undefined
+          }
+        }
+      });
+
+      it('should return false', () => {
+        expect((service as any).isCacheablePayload(entry)).toEqual(false);
+      });
+    });
+  });
+
+  describe('isUnCacheablePayload', () => {
+    let entry;
+
+    describe('when the entry\'s response contains an uncacheable object', () => {
+      beforeEach(() => {
+        entry = {
+          response: {
+            unCacheableObject: Object.assign({})
+          }
+        }
+      });
+
+      it('should return true', () => {
+        expect((service as any).isUnCacheablePayload(entry)).toEqual(true);
+      });
+    });
+
+    describe('when the entry\'s response doesn\'t contain an uncacheable object', () => {
+      beforeEach(() => {
+        entry = {
+          response: {}
+        }
+      });
+
+      it('should return false', () => {
+        expect((service as any).isUnCacheablePayload(entry)).toEqual(false);
+      });
+    });
+  });
+
+  describe(`plainObjectToInstance`, () => {
+    describe(`when the object has a recognized type property`, () => {
+      it(`should return a new instance of that type`, () => {
+        const source: any = {
+          type: ITEM,
+          uuid: 'some-uuid'
+        };
+
+        const result = (service as any).plainObjectToInstance(source);
+        result.foo = 'bar'
+
+        expect(result).toEqual(jasmine.any(Item));
+        expect(result.uuid).toEqual('some-uuid');
+        expect(result.foo).toEqual('bar');
+        expect(source.foo).toBeUndefined();
+      });
+    });
+    describe(`when the object doesn't have a recognized type property`, () => {
+      it(`should return a new plain JS object`, () => {
+        const source: any = {
+          type: 'foobar',
+          uuid: 'some-uuid'
+        };
+
+        const result = (service as any).plainObjectToInstance(source);
+        result.foo = 'bar'
+
+        expect(result).toEqual(jasmine.any(Object));
+        expect(result.uuid).toEqual('some-uuid');
+        expect(result.foo).toEqual('bar');
+        expect(source.foo).toBeUndefined();
+      });
+    });
+  });
+
+  describe(`buildPaginatedList`, () => {
     beforeEach(() => {
-      expected = paginatedListRD;
+      (objectCache.getList as jasmine.Spy).and.returnValue(observableOf(array));
+      (linkService.resolveLinks as jasmine.Spy).and.callFake((obj) => obj);
+      spyOn(service as any, 'plainObjectToInstance').and.callFake((obj) => obj);
     });
+    describe(`when linksToFollow contains a 'page' link`, () => {
+      let paginatedLinksToFollow;
+      beforeEach(() => {
+        paginatedLinksToFollow = [
+          followLink('page', undefined, true, ...linksToFollow),
+          ...linksToFollow
+        ]
+      });
+      describe(`and the given list doesn't have a page property already`, () => {
+        it(`should call objectCache.getList with the links in _links.page of the given object`, (done) => {
+          (service as any).buildPaginatedList(normalizedPaginatedList, ...paginatedLinksToFollow)
+            .pipe(take(1))
+            .subscribe(() => {
+              expect(objectCache.getList).toHaveBeenCalledWith(pageLinks.map((link: HALLink) => link.href))
+              done();
+            })
+        });
+
+        it(`should call plainObjectToInstance for each of the page objects`, (done) => {
+          (service as any).buildPaginatedList(normalizedPaginatedList, ...paginatedLinksToFollow)
+            .pipe(take(1))
+            .subscribe(() => {
+              array.forEach((element) => {
+                expect((service as any).plainObjectToInstance).toHaveBeenCalledWith(element);
+              })
+              done();
+            })
+        });
+
+        it(`should call linkService.resolveLinks for each of the page objects`, (done) => {
+          (service as any).buildPaginatedList(normalizedPaginatedList, ...paginatedLinksToFollow)
+            .pipe(take(1))
+            .subscribe(() => {
+              array.forEach((element) => {
+                expect(linkService.resolveLinks).toHaveBeenCalledWith(element, ...linksToFollow);
+              })
+              done();
+            })
+        });
+
+        it(`should return a new PaginatedList instance based on the given object`, (done) => {
+          const listAsPlainJSObj = Object.assign({}, normalizedPaginatedList);
+          (service as any).buildPaginatedList(listAsPlainJSObj, ...paginatedLinksToFollow)
+            .pipe(take(1))
+            .subscribe((result) => {
+              expect(listAsPlainJSObj).toEqual(jasmine.any(Object));
+              expect(result).toEqual(jasmine.any(PaginatedList));
+              expect(result).toEqual(paginatedList);
+              done();
+            })
+        });
+
+        describe(`when there are other links as well`, () => {
+          it(`should call linkservice.resolveLinks for those other links`, (done) => {
+            (service as any).buildPaginatedList(normalizedPaginatedList, ...paginatedLinksToFollow)
+              .pipe(take(1))
+              .subscribe(() => {
+                expect(linkService.resolveLinks).toHaveBeenCalledWith(paginatedList, ...linksToFollow);
+                done();
+              })
+          });
+        });
+      });
+
+      describe(`and the given list already has a page property`, () => {
+        it(`should call plainObjectToInstance for each of the page objects`, (done) => {
+          (service as any).buildPaginatedList(paginatedList, ...paginatedLinksToFollow)
+            .pipe(take(1))
+            .subscribe(() => {
+              array.forEach((element) => {
+                expect((service as any).plainObjectToInstance).toHaveBeenCalledWith(element);
+              })
+              done();
+            })
+        });
+
+        it(`should call linkService.resolveLinks for each of the page objects`, (done) => {
+          (service as any).buildPaginatedList(paginatedList, ...paginatedLinksToFollow)
+            .pipe(take(1))
+            .subscribe(() => {
+              array.forEach((element) => {
+                expect(linkService.resolveLinks).toHaveBeenCalledWith(element, ...linksToFollow);
+              })
+              done();
+            })
+        });
+
+        it(`should return a new PaginatedList instance based on the given object`, (done) => {
+          const listAsPlainJSObj = Object.assign({}, paginatedList);
+          (service as any).buildPaginatedList(listAsPlainJSObj, ...paginatedLinksToFollow)
+            .pipe(take(1))
+            .subscribe((result) => {
+              expect(listAsPlainJSObj).toEqual(jasmine.any(Object));
+              expect(result).toEqual(jasmine.any(PaginatedList));
+              expect(result).toEqual(paginatedList);
+              done();
+            })
+        });
 
-    it('should return the correct remoteData of a paginatedList when the input is a (remoteData of an) array', () => {
-      const result = (service as any).toPaginatedList(observableOf(arrayRD), pageInfo);
-      result.subscribe((resultRD) => {
-        expect(resultRD).toEqual(expected);
+        describe(`when there are other links as well`, () => {
+          it(`should call linkservice.resolveLinks for those other links`, (done) => {
+            (service as any).buildPaginatedList(paginatedList, ...paginatedLinksToFollow)
+              .pipe(take(1))
+              .subscribe(() => {
+                expect(linkService.resolveLinks).toHaveBeenCalledWith(paginatedList, ...linksToFollow);
+                done();
+              })
+          });
+        });
       });
     });
 
-    it('should return the correct remoteData of a paginatedList when the input is a (remoteData of a) paginated list', () => {
-      const result = (service as any).toPaginatedList(observableOf(paginatedListRD), pageInfo);
-      result.subscribe((resultRD) => {
-        expect(resultRD).toEqual(expected);
+    describe(`when linksToFollow doesn't contain a 'page' link`, () => {
+      it(`should return a new PaginatedList instance based on the given object`, (done) => {
+        const listAsPlainJSObj = Object.assign({}, paginatedList);
+        (service as any).buildPaginatedList(listAsPlainJSObj, ...linksToFollow)
+          .pipe(take(1))
+          .subscribe((result) => {
+            expect(listAsPlainJSObj).toEqual(jasmine.any(Object));
+            expect(result).toEqual(jasmine.any(PaginatedList));
+            expect(result).toEqual(paginatedList);
+            done();
+          })
       });
     });
   });
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 88d1890de2a..cb79a640916 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -1,31 +1,33 @@
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, race as observableRace } from 'rxjs';
-import { distinctUntilChanged, map, startWith, switchMap } from 'rxjs/operators';
 import {
-  hasValue,
-  hasValueOperator,
-  isEmpty,
-  isNotEmpty,
-  isNotUndefined
-} from '../../../shared/empty.util';
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  race as observableRace
+} from 'rxjs';
+import { map, switchMap, filter, distinctUntilKeyChanged } from 'rxjs/operators';
+import { hasValue, isEmpty, isNotEmpty, hasNoValue, isUndefined } from '../../../shared/empty.util';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../../data/paginated-list';
+import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
-import { RemoteDataError } from '../../data/remote-data-error';
-import { RequestEntry } from '../../data/request.reducer';
-import { RequestService } from '../../data/request.service';
 import {
-  filterSuccessfulResponses,
-  getRequestFromRequestHref,
-  getRequestFromRequestUUID,
-  getResourceLinksFromResponse
-} from '../../shared/operators';
-import { PageInfo } from '../../shared/page-info.model';
-import { CacheableObject } from '../object-cache.reducer';
+  RequestEntry,
+  ResponseState,
+  RequestEntryState,
+  hasSucceeded
+} from '../../data/request.reducer';
+import { RequestService } from '../../data/request.service';
+import { getRequestFromRequestHref, getRequestFromRequestUUID } from '../../shared/operators';
 import { ObjectCacheService } from '../object-cache.service';
-import { DSOSuccessResponse, ErrorResponse } from '../response.models';
 import { LinkService } from './link.service';
+import { HALLink } from '../../shared/hal-link.model';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { getClassForType } from './build-decorators';
+import { HALResource } from '../../shared/hal-resource.model';
+import { PAGINATED_LIST } from '../../data/paginated-list.resource-type';
+import { getUrlWithoutEmbedParams } from '../../index/index.selectors';
+import { getResourceTypeValueFor } from '../object-cache.reducer';
 
 @Injectable()
 export class RemoteDataBuildService {
@@ -35,15 +37,174 @@ export class RemoteDataBuildService {
   }
 
   /**
-   * Creates a single {@link RemoteData} object based on the response of a request to the REST server, with a list of
-   * {@link FollowLinkConfig} that indicate which embedded info should be added to the object
-   * @param href$             Observable href of object we want to retrieve
+   * Creates an Observable<T> with the payload for a RemoteData object
+   *
+   * @param requestEntry$   The {@link RequestEntry} to create a {@link RemoteData} object from
+   * @param href$           The self link of the object to retrieve. If left empty, the root
+   *                        payload link from the response will be used. These links will differ in
+   *                        case we're retrieving an object that was embedded in the request for
+   *                        another
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                        should be automatically resolved
+   * @private
+   */
+  private buildPayload<T>(requestEntry$: Observable<RequestEntry>, href$?: Observable<string>, ...linksToFollow: Array<FollowLinkConfig<any>>): Observable<T> {
+    if (hasNoValue(href$)) {
+      href$ = observableOf(undefined);
+    }
+    return observableCombineLatest([href$, requestEntry$]).pipe(
+      switchMap(([href, entry]: [string, RequestEntry]) => {
+        const hasExactMatchInObjectCache = this.hasExactMatchInObjectCache(href, entry);
+        if (hasValue(entry.response) &&
+          (hasExactMatchInObjectCache || this.isCacheablePayload(entry) || this.isUnCacheablePayload(entry))) {
+          if (hasExactMatchInObjectCache) {
+            return this.objectCache.getObjectByHref(href);
+          } else if (this.isCacheablePayload(entry)) {
+            return this.objectCache.getObjectByHref(entry.response.payloadLink.href);
+          } else {
+            return [this.plainObjectToInstance<T>(entry.response.unCacheableObject)];
+          }
+        } else if (hasSucceeded(entry.state)) {
+          return [null];
+        } else {
+          return [undefined];
+        }
+      }),
+      switchMap((obj: T) => {
+        if (hasValue(obj)) {
+          if (getResourceTypeValueFor((obj as any).type) === PAGINATED_LIST.value) {
+            return this.buildPaginatedList<T>(obj, ...linksToFollow);
+          } else if (isNotEmpty(linksToFollow)) {
+            return [this.linkService.resolveLinks(obj, ...linksToFollow)];
+          }
+        }
+        return [obj];
+      })
+    );
+  }
+
+  /**
+   * When an object is returned from the store, it's possibly a plain javascript object (in case
+   * it was first instantiated on the server). This method will turn it in to an instance of the
+   * class corresponding with its type property. If it doesn't have one, or we can't find a
+   * constructor for that type, it will remain a plain object.
+   *
+   * @param obj  The object to turn in to a class instance based on its type property
+   */
+  private plainObjectToInstance<T>(obj: any): T {
+    const type: GenericConstructor<T> = getClassForType(obj.type);
+    if (typeof type === 'function') {
+      return Object.assign(new type(), obj) as T
+    } else {
+      return Object.assign({}, obj) as T;
+    }
+  };
+
+  /**
+   * Returns true if there is a match for the given self link and request entry in the object cache,
+   * false otherwise. The goal is to find objects that were not the root object of the request, but
+   * embedded.
+   *
+   * @param href the self link to check
+   * @param entry the request entry the object has to match
+   * @private
+   */
+  private hasExactMatchInObjectCache(href: string, entry: RequestEntry): boolean {
+    return hasValue(entry) && hasValue(entry.request) && isNotEmpty(entry.request.uuid) &&
+      hasValue(href) && this.objectCache.hasByHref(href, entry.request.uuid);
+  }
+
+  /**
+   * Returns true if the given entry has a valid payloadLink, false otherwise
+   * @param entry the RequestEntry to check
+   * @private
+   */
+  private isCacheablePayload(entry: RequestEntry): boolean {
+    return hasValue(entry.response.payloadLink) && isNotEmpty(entry.response.payloadLink.href);
+  }
+
+  /**
+   * Returns true if the given entry has an unCacheableObject, false otherwise
+   * @param entry the RequestEntry to check
+   * @private
+   */
+  private isUnCacheablePayload(entry: RequestEntry): boolean {
+    return hasValue(entry.response.unCacheableObject);
+  }
+
+  /**
+   * Build a PaginatedList by creating a new PaginatedList instance from the given object, to ensure
+   * it has the correct prototype (you can't be sure if it came from the ngrx store), by
+   * retrieving the objects in the list and following any links.
+   *
+   * @param object          A plain object to be turned in to a {@link PaginatedList}
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  private buildPaginatedList<T>(object: any, ...linksToFollow: Array<FollowLinkConfig<any>>): Observable<T> {
+    const pageLink = linksToFollow.find((linkToFollow: FollowLinkConfig<any>) => linkToFollow.name === 'page');
+    const otherLinks = linksToFollow.filter((linkToFollow: FollowLinkConfig<any>) => linkToFollow.name !== 'page');
+
+    const paginatedList = Object.assign(new PaginatedList(), object);
+
+    if (hasValue(pageLink)) {
+      if (isEmpty(paginatedList.page)) {
+        const pageSelfLinks = paginatedList._links.page.map((link: HALLink) => link.href);
+        return this.objectCache.getList(pageSelfLinks).pipe(map((page: any[]) => {
+          paginatedList.page = page
+            .map((obj: any) => this.plainObjectToInstance<T>(obj))
+            .map((obj: any) =>
+              this.linkService.resolveLinks(obj, ...pageLink.linksToFollow)
+            );
+          if (isNotEmpty(otherLinks)) {
+            return this.linkService.resolveLinks(paginatedList, ...otherLinks);
+          }
+          return paginatedList;
+        }));
+      } else {
+        // in case the elements of the paginated list were already filled in, because they're UnCacheableObjects
+        paginatedList.page = paginatedList.page
+          .map((obj: any) => this.plainObjectToInstance<T>(obj))
+          .map((obj: any) =>
+            this.linkService.resolveLinks(obj, ...pageLink.linksToFollow)
+          );
+        if (isNotEmpty(otherLinks)) {
+          return observableOf(this.linkService.resolveLinks(paginatedList, ...otherLinks));
+        }
+      }
+    }
+    return observableOf(paginatedList as any);
+  }
+
+  /**
+   * Creates a {@link RemoteData} object for a rest request and its response
+   *
+   * @param requestUUID$      The UUID of the request we want to retrieve
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  buildFromRequestUUID<T>(requestUUID$: string | Observable<string>, ...linksToFollow: Array<FollowLinkConfig<any>>): Observable<RemoteData<T>> {
+    if (typeof requestUUID$ === 'string') {
+      requestUUID$ = observableOf(requestUUID$);
+    }
+    const requestEntry$ = requestUUID$.pipe(getRequestFromRequestUUID(this.requestService));
+
+    const payload$ = this.buildPayload<T>(requestEntry$, undefined, ...linksToFollow);
+
+    return this.toRemoteDataObservable<T>(requestEntry$, payload$);
+  }
+
+  /**
+   * Creates a {@link RemoteData} object for a rest request and its response
+   *
+   * @param href$             self link of object we want to retrieve
    * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  buildSingle<T extends CacheableObject>(href$: string | Observable<string>, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<T>> {
+  buildFromHref<T>(href$: string | Observable<string>, ...linksToFollow: Array<FollowLinkConfig<any>>): Observable<RemoteData<T>> {
     if (typeof href$ === 'string') {
       href$ = observableOf(href$);
     }
+
+    href$ = href$.pipe(map((href: string) => getUrlWithoutEmbedParams(href)));
+
     const requestUUID$ = href$.pipe(
       switchMap((href: string) =>
         this.objectCache.getRequestUUIDBySelfLink(href)),
@@ -52,209 +213,143 @@ export class RemoteDataBuildService {
     const requestEntry$ = observableRace(
       href$.pipe(getRequestFromRequestHref(this.requestService)),
       requestUUID$.pipe(getRequestFromRequestUUID(this.requestService)),
+    ).pipe(
+      distinctUntilKeyChanged('lastUpdated')
     );
-    // always use self link if that is cached, only if it isn't, get it via the response.
-    const payload$ =
-      observableCombineLatest(
-        href$.pipe(
-          switchMap((href: string) => this.objectCache.getObjectBySelfLink<T>(href)),
-          startWith(undefined)),
-        requestEntry$.pipe(
-          getResourceLinksFromResponse(),
-          switchMap((resourceSelfLinks: string[]) => {
-            if (isNotEmpty(resourceSelfLinks)) {
-              return this.objectCache.getObjectBySelfLink<T>(resourceSelfLinks[0]);
-            } else {
-              return observableOf(undefined);
-            }
-          }),
-          distinctUntilChanged(),
-          startWith(undefined)
-        )
-      ).pipe(
-        map(([fromSelfLink, fromResponse]) => {
-          if (hasValue(fromSelfLink)) {
-            return fromSelfLink;
-          } else {
-            return fromResponse;
-          }
-        }),
-        hasValueOperator(),
-        map((obj: T) =>
-          this.linkService.resolveLinks(obj, ...linksToFollow)
-        ),
-        startWith(undefined),
-        distinctUntilChanged()
-      );
-    return this.toRemoteDataObservable(requestEntry$, payload$);
+
+    const payload$ = this.buildPayload<T>(requestEntry$, href$, ...linksToFollow);
+
+    return this.toRemoteDataObservable<T>(requestEntry$, payload$);
+  }
+
+  /**
+   * Creates a single {@link RemoteData} object based on the response of a request to the REST server, with a list of
+   * {@link FollowLinkConfig} that indicate which embedded info should be added to the object
+   * @param href$             Observable href of object we want to retrieve
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  buildSingle<T>(href$: string | Observable<string>, ...linksToFollow: Array<FollowLinkConfig<any>>): Observable<RemoteData<T>> {
+    return this.buildFromHref(href$, ...linksToFollow);
   }
 
   toRemoteDataObservable<T>(requestEntry$: Observable<RequestEntry>, payload$: Observable<T>) {
-    return observableCombineLatest(requestEntry$, payload$).pipe(
-      map(([reqEntry, payload]) => {
-        const requestPending = hasValue(reqEntry) && hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true;
-        const responsePending = hasValue(reqEntry) && hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false;
-        let isSuccessful: boolean;
-        let error: RemoteDataError;
-        const response = reqEntry ? reqEntry.response : undefined;
-        if (hasValue(response)) {
-          isSuccessful = response.isSuccessful;
-          const errorMessage = isSuccessful === false ? (response as ErrorResponse).errorMessage : undefined;
-          if (hasValue(errorMessage)) {
-            error = new RemoteDataError(
-              response.statusCode,
-              response.statusText,
-              errorMessage
-            );
-          }
+    return observableCombineLatest([
+      requestEntry$,
+      payload$
+    ]).pipe(
+      filter(([entry,payload]: [RequestEntry, T]) =>
+        hasValue(entry) &&
+        // filter out cases where the state is successful, but the payload isn't yet set
+        !(hasSucceeded(entry.state) && isUndefined(payload))
+      ),
+      map(([entry, payload]: [RequestEntry, T]) => {
+        let response = entry.response;
+        if (hasNoValue(response)) {
+          response = {} as ResponseState;
         }
+
         return new RemoteData(
-          requestPending,
-          responsePending,
-          isSuccessful,
-          error,
+          response.timeCompleted,
+          entry.request.responseMsToLive,
+          entry.lastUpdated,
+          entry.state,
+          response.errorMessage,
           payload,
-          hasValue(response) ? response.statusCode : undefined
-
-        );
+          response.statusCode
+        )
       })
     );
   }
 
   /**
    * Creates a list of {@link RemoteData} objects based on the response of a request to the REST server, with a list of
+   *
+   * Note: T extends HALResource not CacheableObject, because a PaginatedList is a CacheableObject in and of itself
+   *
    * {@link FollowLinkConfig} that indicate which embedded info should be added to the objects
    * @param href$             Observable href of objects we want to retrieve
    * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  buildList<T extends CacheableObject>(href$: string | Observable<string>, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
-    if (typeof href$ === 'string') {
-      href$ = observableOf(href$);
-    }
-
-    const requestEntry$ = href$.pipe(getRequestFromRequestHref(this.requestService));
-    const tDomainList$ = requestEntry$.pipe(
-      getResourceLinksFromResponse(),
-      switchMap((resourceUUIDs: string[]) => {
-        return this.objectCache.getList(resourceUUIDs).pipe(
-          map((objs: T[]) => {
-            return objs.map((obj: T) =>
-              this.linkService.resolveLinks(obj, ...linksToFollow)
-            );
-          }));
-      }),
-      startWith([]),
-      distinctUntilChanged(),
-    );
-    const pageInfo$ = requestEntry$.pipe(
-      filterSuccessfulResponses(),
-      map((response: DSOSuccessResponse) => {
-        if (hasValue((response as DSOSuccessResponse).pageInfo)) {
-          const resPageInfo = (response as DSOSuccessResponse).pageInfo;
-          if (isNotEmpty(resPageInfo) && resPageInfo.currentPage >= 0) {
-            return Object.assign({}, resPageInfo, { currentPage: resPageInfo.currentPage + 1 });
-          } else {
-            return resPageInfo;
-          }
-        }
-      })
-    );
-
-    const payload$ = observableCombineLatest(tDomainList$, pageInfo$).pipe(
-      map(([tDomainList, pageInfo]) => {
-        return new PaginatedList(pageInfo, tDomainList);
-      })
-    );
-
-    return this.toRemoteDataObservable(requestEntry$, payload$);
+  buildList<T extends HALResource>(href$: string | Observable<string>, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
+    return this.buildFromHref<PaginatedList<T>>(href$, followLink('page', undefined, false, ...linksToFollow));
   }
 
+  /**
+   * Turns an array of RemoteData observables in to an observable RemoteData[]
+   *
+   * By doing this you lose most of the info about the status of the original
+   * RemoteData objects, as you have to squash them down in to one. So use
+   * this only if the list you need isn't available on the REST API. If you
+   * need to use it, it's likely an indication that a REST endpoint is missing
+   *
+   * @param input     the array of RemoteData observables to start from
+   */
   aggregate<T>(input: Array<Observable<RemoteData<T>>>): Observable<RemoteData<T[]>> {
 
     if (isEmpty(input)) {
-      return createSuccessfulRemoteDataObject$([]);
+      return createSuccessfulRemoteDataObject$([], new Date().getTime());
     }
 
-    return observableCombineLatest(...input).pipe(
+    return observableCombineLatest(input).pipe(
       map((arr) => {
-        // The request of an aggregate RD should be pending if at least one
-        // of the RDs it's based on is still in the state RequestPending
-        const requestPending: boolean = arr
-          .map((d: RemoteData<T>) => d.isRequestPending)
-          .find((b: boolean) => b === true);
-
-        // The response of an aggregate RD should be pending if no requests
-        // are still pending and at least one of the RDs it's based
-        // on is still in the state ResponsePending
-        const responsePending: boolean = !requestPending && arr
-          .map((d: RemoteData<T>) => d.isResponsePending)
-          .find((b: boolean) => b === true);
-
-        let isSuccessful: boolean;
-        // isSuccessful should be undefined until all responses have come in.
-        // We can't know its state beforehand. We also can't say it's false
-        // because that would imply a request failed.
-        if (!(requestPending || responsePending)) {
-          isSuccessful = arr
-            .map((d: RemoteData<T>) => d.hasSucceeded)
-            .every((b: boolean) => b === true);
+        const timeCompleted = arr
+          .map((d: RemoteData<T>) => d.timeCompleted)
+          .reduce((max: number, current: number) => current > max ? current : max)
+
+        const msToLive = arr
+          .map((d: RemoteData<T>) => d.msToLive)
+          .reduce((min: number, current: number) => current < min ? current : min)
+
+        const lastUpdated = arr
+          .map((d: RemoteData<T>) => d.lastUpdated)
+          .reduce((max: number, current: number) => current > max ? current : max)
+
+        let state: RequestEntryState;
+        if (arr.some((d: RemoteData<T>) => d.isRequestPending)) {
+          state = RequestEntryState.RequestPending;
+        } else if (arr.some((d: RemoteData<T>) => d.isResponsePending)) {
+          state = RequestEntryState.ResponsePending;
+        } else if (arr.some((d: RemoteData<T>) => d.isErrorStale)) {
+          state = RequestEntryState.ErrorStale;
+        } else if (arr.some((d: RemoteData<T>) => d.isError)) {
+          state = RequestEntryState.Error;
+        } else if (arr.some((d: RemoteData<T>) => d.isSuccessStale)) {
+          state = RequestEntryState.SuccessStale;
+        } else {
+          state = RequestEntryState.Success;
         }
 
         const errorMessage: string = arr
-          .map((d: RemoteData<T>) => d.error)
-          .map((e: RemoteDataError, idx: number) => {
+          .map((d: RemoteData<T>) => d.errorMessage)
+          .map((e: string, idx: number) => {
             if (hasValue(e)) {
-              return `[${idx}]: ${e.message}`;
+              return `[${idx}]: ${e}`;
             }
           }).filter((e: string) => hasValue(e))
           .join(', ');
 
-        const statusText: string = arr
-          .map((d: RemoteData<T>) => d.error)
-          .map((e: RemoteDataError, idx: number) => {
-            if (hasValue(e)) {
-              return `[${idx}]: ${e.statusText}`;
-            }
-          }).filter((c: string) => hasValue(c))
-          .join(', ');
+        const statusCodes = new Set(arr
+          .map((d: RemoteData<T>) => d.statusCode));
 
-        const statusCode: number = arr
-          .map((d: RemoteData<T>) => d.error)
-          .map((e: RemoteDataError, idx: number) => {
-            if (hasValue(e)) {
-              return e.statusCode;
-            }
-          }).filter((c: number) => hasValue(c))
-          .reduce((acc, status) => status, undefined);
+        let statusCode: number;
 
-        const error = new RemoteDataError(statusCode, statusText, errorMessage);
+        if (statusCodes.size === 1) {
+          statusCode = statusCodes.values().next().value;
+        } else if (statusCodes.size > 1) {
+          statusCode = 207;
+        }
 
         const payload: T[] = arr.map((d: RemoteData<T>) => d.payload);
 
         return new RemoteData(
-          requestPending,
-          responsePending,
-          isSuccessful,
-          error,
-          payload
+          timeCompleted,
+          msToLive,
+          lastUpdated,
+          state,
+          errorMessage,
+          payload,
+          statusCode
         );
       }))
   }
-
-  private toPaginatedList<T>(input: Observable<RemoteData<T[] | PaginatedList<T>>>, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<T>>> {
-    return input.pipe(
-      map((rd: RemoteData<T[] | PaginatedList<T>>) => {
-        const rdAny = rd as any;
-        const newRD = new RemoteData(rdAny.requestPending, rdAny.responsePending, rdAny.isSuccessful, rd.error, undefined);
-        if (Array.isArray(rd.payload)) {
-          return Object.assign(newRD, { payload: new PaginatedList(pageInfo, rd.payload) })
-        } else if (isNotUndefined(rd.payload)) {
-          return Object.assign(newRD, { payload: new PaginatedList(pageInfo, rd.payload.page) });
-        } else {
-          return Object.assign(newRD, { payload: new PaginatedList(pageInfo, []) });
-        }
-      })
-    );
-  }
-
 }
diff --git a/src/app/core/cache/cache-entry.ts b/src/app/core/cache/cache-entry.ts
index 52ec7b8af09..ae302dfaeb7 100644
--- a/src/app/core/cache/cache-entry.ts
+++ b/src/app/core/cache/cache-entry.ts
@@ -1,4 +1,4 @@
 export interface CacheEntry {
-  timeAdded: number;
+  timeCompleted: number;
   msToLive: number;
 }
diff --git a/src/app/core/cache/models/search-param.model.ts b/src/app/core/cache/models/request-param.model.ts
similarity index 86%
rename from src/app/core/cache/models/search-param.model.ts
rename to src/app/core/cache/models/request-param.model.ts
index 3881dbe8b7b..ac21fe0b8a8 100644
--- a/src/app/core/cache/models/search-param.model.ts
+++ b/src/app/core/cache/models/request-param.model.ts
@@ -2,7 +2,7 @@
 /**
  * Class representing a query parameter (query?fieldName=fieldValue) used in FindListOptions object
  */
-export class SearchParam {
+export class RequestParam {
   constructor(public fieldName: string, public fieldValue: any) {
 
   }
diff --git a/src/app/core/cache/object-cache.actions.ts b/src/app/core/cache/object-cache.actions.ts
index 8531677ffc7..ed509341a70 100644
--- a/src/app/core/cache/object-cache.actions.ts
+++ b/src/app/core/cache/object-cache.actions.ts
@@ -23,9 +23,10 @@ export class AddToObjectCacheAction implements Action {
   type = ObjectCacheActionTypes.ADD;
   payload: {
     objectToCache: CacheableObject;
-    timeAdded: number;
+    timeCompleted: number;
     msToLive: number;
     requestUUID: string;
+    alternativeLink?: string;
   };
 
   /**
@@ -33,17 +34,18 @@ export class AddToObjectCacheAction implements Action {
    *
    * @param objectToCache
    *    the object to add
-   * @param timeAdded
+   * @param timeCompleted
    *    the time it was added
    * @param msToLive
    *    the amount of milliseconds before it should expire
-   * @param requestHref
-   *    The href of the request that resulted in this object
+   * @param requestUUID
+   *    The uuid of the request that resulted in this object
    *    This isn't necessarily the same as the object's self
    *    link, it could have been part of a list for example
+   *  @param alternativeLink An optional alternative link to this object
    */
-  constructor(objectToCache: CacheableObject, timeAdded: number, msToLive: number, requestUUID: string) {
-    this.payload = { objectToCache, timeAdded, msToLive, requestUUID };
+  constructor(objectToCache: CacheableObject, timeCompleted: number, msToLive: number, requestUUID: string, alternativeLink?: string) {
+    this.payload = { objectToCache, timeCompleted, msToLive, requestUUID, alternativeLink };
   }
 }
 
@@ -66,7 +68,7 @@ export class RemoveFromObjectCacheAction implements Action {
 }
 
 /**
- * An ngrx action to reset the timeAdded property of all cached objects
+ * An ngrx action to reset the timeCompleted property of all cached objects
  */
 export class ResetObjectCacheTimestampsAction implements Action {
   type = ObjectCacheActionTypes.RESET_TIMESTAMPS;
@@ -76,7 +78,7 @@ export class ResetObjectCacheTimestampsAction implements Action {
    * Create a new ResetObjectCacheTimestampsAction
    *
    * @param newTimestamp
-   *    the new timeAdded all objects should get
+   *    the new timeCompleted all objects should get
    */
   constructor(newTimestamp: number) {
     this.payload = newTimestamp;
diff --git a/src/app/core/cache/object-cache.reducer.spec.ts b/src/app/core/cache/object-cache.reducer.spec.ts
index 6519e887c91..077a1e67f8b 100644
--- a/src/app/core/cache/object-cache.reducer.spec.ts
+++ b/src/app/core/cache/object-cache.reducer.spec.ts
@@ -26,15 +26,20 @@ describe('objectCacheReducer', () => {
   const selfLink1 = 'https://localhost:8080/api/core/items/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
   const selfLink2 = 'https://localhost:8080/api/core/items/28b04544-1766-4e82-9728-c4e93544ecd3';
   const newName = 'new different name';
+  const altLink1 = 'https://alternative.link/endpoint/1234';
+  const altLink2 = 'https://alternative.link/endpoint/5678';
+  const altLink3 = 'https://alternative.link/endpoint/9123';
+  const altLink4 = 'https://alternative.link/endpoint/4567';
   const testState = {
     [selfLink1]: {
       data: {
         type: Item.type,
         self: selfLink1,
         foo: 'bar',
-        _links: { self: { href: selfLink1 } }
+        _links: { self: { href: selfLink1 } },
       },
-      timeAdded: new Date().getTime(),
+      alternativeLinks: [altLink1, altLink2],
+      timeCompleted: new Date().getTime(),
       msToLive: 900000,
       requestUUID: requestUUID1,
       patches: [],
@@ -47,7 +52,8 @@ describe('objectCacheReducer', () => {
         foo: 'baz',
         _links: { self: { href: requestUUID2 } }
       },
-      timeAdded: new Date().getTime(),
+      alternativeLinks: [altLink3, altLink4],
+      timeCompleted: new Date().getTime(),
       msToLive: 900000,
       requestUUID: selfLink2,
       patches: [],
@@ -73,15 +79,16 @@ describe('objectCacheReducer', () => {
   it('should add the payload to the cache in response to an ADD action', () => {
     const state = Object.create(null);
     const objectToCache = { self: selfLink1, type: Item.type, _links: { self: { href: selfLink1 } } };
-    const timeAdded = new Date().getTime();
+    const timeCompleted = new Date().getTime();
     const msToLive = 900000;
     const requestUUID = requestUUID1;
-    const action = new AddToObjectCacheAction(objectToCache, timeAdded, msToLive, requestUUID);
+    const action = new AddToObjectCacheAction(objectToCache, timeCompleted, msToLive, requestUUID, altLink1);
     const newState = objectCacheReducer(state, action);
 
     expect(newState[selfLink1].data).toEqual(objectToCache);
-    expect(newState[selfLink1].timeAdded).toEqual(timeAdded);
+    expect(newState[selfLink1].timeCompleted).toEqual(timeCompleted);
     expect(newState[selfLink1].msToLive).toEqual(msToLive);
+    expect(newState[selfLink1].alternativeLinks.includes(altLink1)).toBeTrue();
   });
 
   it('should overwrite an object in the cache in response to an ADD action if it already exists', () => {
@@ -90,12 +97,12 @@ describe('objectCacheReducer', () => {
       foo: 'baz',
       somethingElse: true,
       type: Item.type,
-      _links: { self: { href: selfLink1 } }
+      _links: { self: { href: selfLink1 } },
     };
-    const timeAdded = new Date().getTime();
+    const timeCompleted = new Date().getTime();
     const msToLive = 900000;
     const requestUUID = requestUUID1;
-    const action = new AddToObjectCacheAction(objectToCache, timeAdded, msToLive, requestUUID);
+    const action = new AddToObjectCacheAction(objectToCache, timeCompleted, msToLive, requestUUID, altLink1);
     const newState = objectCacheReducer(testState, action);
 
     /* tslint:disable:no-string-literal */
@@ -107,10 +114,10 @@ describe('objectCacheReducer', () => {
   it('should perform the ADD action without affecting the previous state', () => {
     const state = Object.create(null);
     const objectToCache = { self: selfLink1, type: Item.type, _links: { self: { href: selfLink1 } } };
-    const timeAdded = new Date().getTime();
+    const timeCompleted = new Date().getTime();
     const msToLive = 900000;
     const requestUUID = requestUUID1;
-    const action = new AddToObjectCacheAction(objectToCache, timeAdded, msToLive, requestUUID);
+    const action = new AddToObjectCacheAction(objectToCache, timeCompleted, msToLive, requestUUID, altLink1);
     deepFreeze(state);
 
     objectCacheReducer(state, action);
@@ -144,7 +151,7 @@ describe('objectCacheReducer', () => {
     const action = new ResetObjectCacheTimestampsAction(newTimestamp);
     const newState = objectCacheReducer(testState, action);
     Object.keys(newState).forEach((key) => {
-      expect(newState[key].timeAdded).toEqual(newTimestamp);
+      expect(newState[key].timeCompleted).toEqual(newTimestamp);
     });
   });
 
diff --git a/src/app/core/cache/object-cache.reducer.ts b/src/app/core/cache/object-cache.reducer.ts
index a39ceb4e167..ce443cb931d 100644
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -1,26 +1,19 @@
-import { autoserialize, deserialize } from 'cerialize';
 import { HALLink } from '../shared/hal-link.model';
 import { HALResource } from '../shared/hal-resource.model';
-import { excludeFromEquals } from '../utilities/equals.decorators';
 import {
   ObjectCacheAction,
   ObjectCacheActionTypes,
   AddToObjectCacheAction,
   RemoveFromObjectCacheAction,
   ResetObjectCacheTimestampsAction,
-  AddPatchObjectCacheAction, ApplyPatchObjectCacheAction
+  AddPatchObjectCacheAction,
+  ApplyPatchObjectCacheAction
 } from './object-cache.actions';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { CacheEntry } from './cache-entry';
 import { ResourceType } from '../shared/resource-type';
 import { applyPatch, Operation } from 'fast-json-patch';
 
-export enum DirtyType {
-  Created = 'Created',
-  Updated = 'Updated',
-  Deleted = 'Deleted'
-}
-
 /**
  * An interface to represent a JsonPatch
  */
@@ -41,6 +34,21 @@ export abstract class TypedObject {
   type: ResourceType;
 }
 
+/**
+ * Get the string value for an object that may be a string or a ResourceType
+ *
+ * @param type the object to get the type value for
+ */
+export const getResourceTypeValueFor = (type: any): string => {
+  if (hasValue(type)) {
+    if (typeof type === 'string') {
+      return type;
+    } else if (typeof type.value === 'string') {
+      return type.value;
+    }
+  }
+}
+
 /* tslint:disable:max-classes-per-file */
 /**
  * An interface to represent objects that can be cached
@@ -50,7 +58,6 @@ export abstract class TypedObject {
 export class CacheableObject extends TypedObject implements HALResource {
   uuid?: string;
   handle?: string;
-
   _links: {
     self: HALLink;
   }
@@ -65,13 +72,44 @@ export class CacheableObject extends TypedObject implements HALResource {
  * An entry in the ObjectCache
  */
 export class ObjectCacheEntry implements CacheEntry {
+  /**
+   * The object being cached
+   */
   data: CacheableObject;
-  timeAdded: number;
+
+  /**
+   * The timestamp for when this entry was set to completed
+   */
+  timeCompleted: number;
+
+  /**
+   * The number of milliseconds after the entry completes until it becomes stale
+   */
   msToLive: number;
+
+  /**
+   * The UUID of the request that caused this entry to be added
+   */
   requestUUID: string;
+
+  /**
+   * An array of patches that were made on the client side to this entry, but haven't been sent to the server yet
+   */
   patches: Patch[] = [];
+
+  /**
+   * Whether this entry has changes that haven't been sent to the server yet
+   */
   isDirty: boolean;
+
+  /**
+   * A list of links, apart from the self link, that also uniquely identify this object
+   * e.g. https://rest.api/collections/12345/logo could be an alternative link for a
+   * bitstream
+   */
+  alternativeLinks: string[];
 }
+
 /* tslint:enable:max-classes-per-file */
 
 /**
@@ -137,15 +175,17 @@ export function objectCacheReducer(state = initialState, action: ObjectCacheActi
  *    the new state, with the object added, or overwritten.
  */
 function addToObjectCache(state: ObjectCacheState, action: AddToObjectCacheAction): ObjectCacheState {
-  const existing = state[action.payload.objectToCache._links.self.href];
+  const existing = state[action.payload.objectToCache._links.self.href] || {} as any;
+  const newAltLinks = hasValue(action.payload.alternativeLink) ? [action.payload.alternativeLink] : [];
   return Object.assign({}, state, {
     [action.payload.objectToCache._links.self.href]: {
       data: action.payload.objectToCache,
-      timeAdded: action.payload.timeAdded,
+      timeCompleted: action.payload.timeCompleted,
       msToLive: action.payload.msToLive,
       requestUUID: action.payload.requestUUID,
-      isDirty: (hasValue(existing) ? isNotEmpty(existing.patches) : false),
-      patches: (hasValue(existing) ? existing.patches : [])
+      isDirty: isNotEmpty(existing.patches),
+      patches: existing.patches || [],
+      alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks]
     }
   });
 }
@@ -172,20 +212,20 @@ function removeFromObjectCache(state: ObjectCacheState, action: RemoveFromObject
 }
 
 /**
- * Set the timeAdded timestamp of every cached object to the specified value
+ * Set the timeCompleted timestamp of every cached object to the specified value
  *
  * @param state
  *    the current state
  * @param action
  *    a ResetObjectCacheTimestampsAction
  * @return ObjectCacheState
- *    the new state, with all timeAdded timestamps set to the specified value
+ *    the new state, with all timeCompleted timestamps set to the specified value
  */
 function resetObjectCacheTimestamps(state: ObjectCacheState, action: ResetObjectCacheTimestampsAction): ObjectCacheState {
   const newState = Object.create(null);
   Object.keys(state).forEach((key) => {
     newState[key] = Object.assign({}, state[key], {
-      timeAdded: action.payload
+      timeCompleted: action.payload
     });
   });
   return newState;
diff --git a/src/app/core/cache/object-cache.service.spec.ts b/src/app/core/cache/object-cache.service.spec.ts
index e7c208e095a..060f4d04758 100644
--- a/src/app/core/cache/object-cache.service.spec.ts
+++ b/src/app/core/cache/object-cache.service.spec.ts
@@ -1,54 +1,73 @@
 import * as ngrx from '@ngrx/store';
 import { Store } from '@ngrx/store';
 import { Operation } from 'fast-json-patch';
-import { of as observableOf } from 'rxjs';
+import { empty, of as observableOf } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { CoreState } from '../core.reducers';
 import { RestRequestMethod } from '../data/rest-request-method';
 import { Item } from '../shared/item.model';
-import {
-  AddPatchObjectCacheAction,
-  AddToObjectCacheAction,
-  ApplyPatchObjectCacheAction,
-  RemoveFromObjectCacheAction
-} from './object-cache.actions';
+import { AddPatchObjectCacheAction, AddToObjectCacheAction, ApplyPatchObjectCacheAction, RemoveFromObjectCacheAction } from './object-cache.actions';
 import { Patch } from './object-cache.reducer';
-
 import { ObjectCacheService } from './object-cache.service';
 import { AddToSSBAction } from './server-sync-buffer.actions';
+import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import { IndexName } from '../index/index.reducer';
+import { HALLink } from '../shared/hal-link.model';
+import { getTestScheduler } from 'jasmine-marbles';
 
 describe('ObjectCacheService', () => {
   let service: ObjectCacheService;
   let store: Store<CoreState>;
   let linkServiceStub;
 
-  const selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
-  const requestUUID = '4d3a4ce8-a375-4b98-859b-39f0a014d736';
-  const timestamp = new Date().getTime();
-  const msToLive = 900000;
-  let objectToCache = {
-    type: Item.type,
-    _links: {
-      self: { href: selfLink }
-    }
-  };
+  let selfLink;
+  let anotherLink;
+  let altLink1;
+  let altLink2;
+  let requestUUID;
+  let alternativeLink;
+  let timestamp;
+  let timestamp2;
+  let msToLive;
+  let msToLive2
+  let objectToCache;
   let cacheEntry;
+  let cacheEntry2;
   let invalidCacheEntry;
-  const operations = [{ op: 'replace', path: '/name', value: 'random string' } as Operation];
+  let operations;
 
   function init() {
+    selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
+    anotherLink = 'https://another.link/endpoint/1234';
+    altLink1 = 'https://alternative.link/endpoint/1234';
+    altLink2 = 'https://alternative.link/endpoint/5678';
+    requestUUID = '4d3a4ce8-a375-4b98-859b-39f0a014d736';
+    alternativeLink = 'https://rest.api/endpoint/5e4f8a5-be98-4c51-9fd8-6bfedcbd59b7/item';
+    timestamp = new Date().getTime();
+    timestamp2 = new Date().getTime() - 200;
+    msToLive = 900000;
+    msToLive2 = 120000;
     objectToCache = {
       type: Item.type,
       _links: {
-        self: { href: selfLink }
+        self: { href: selfLink },
+        anotherLink: { href: anotherLink }
       }
     };
     cacheEntry = {
       data: objectToCache,
-      timeAdded: timestamp,
-      msToLive: msToLive
+      timeCompleted: timestamp,
+      msToLive: msToLive,
+      alternativeLinks: [altLink1, altLink2]
+    };
+    cacheEntry2 = {
+      data: objectToCache,
+      timeCompleted: timestamp2,
+      msToLive: msToLive2,
+      alternativeLinks: [altLink2]
     };
-    invalidCacheEntry = Object.assign({}, cacheEntry, { msToLive: -1 })
+    invalidCacheEntry = Object.assign({}, cacheEntry, { msToLive: -1 });
+    operations = [{ op: 'replace', path: '/name', value: 'random string' } as Operation];
   }
 
   beforeEach(() => {
@@ -68,47 +87,73 @@ describe('ObjectCacheService', () => {
 
   describe('add', () => {
     it('should dispatch an ADD action with the object to add, the time to live, and the current timestamp', () => {
-      service.add(objectToCache, msToLive, requestUUID);
-      expect(store.dispatch).toHaveBeenCalledWith(new AddToObjectCacheAction(objectToCache, timestamp, msToLive, requestUUID));
+      service.add(objectToCache, msToLive, requestUUID, alternativeLink);
+      expect(store.dispatch).toHaveBeenCalledWith(new AddToObjectCacheAction(objectToCache, timestamp, msToLive, requestUUID, alternativeLink));
       expect(linkServiceStub.removeResolvedLinks).toHaveBeenCalledWith(objectToCache);
     });
   });
 
   describe('remove', () => {
+    beforeEach(() => {
+      spyOn(service as any, 'getByHref').and.returnValue(observableOf(cacheEntry));
+    });
+
     it('should dispatch a REMOVE action with the self link of the object to remove', () => {
       service.remove(selfLink);
       expect(store.dispatch).toHaveBeenCalledWith(new RemoveFromObjectCacheAction(selfLink));
     });
+
+    it('should dispatch a REMOVE_BY_SUBSTRING action on the index state for each alternativeLink in the object', () => {
+      service.remove(selfLink);
+      cacheEntry.alternativeLinks.forEach(
+        (link: string) => expect(store.dispatch).toHaveBeenCalledWith(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link)))
+    });
+
+    it('should dispatch a REMOVE_BY_SUBSTRING action on the index state for each _links in the object, except the self link', () => {
+      service.remove(selfLink);
+      Object.entries(objectToCache._links).forEach(([key, value]: [string, HALLink]) => {
+        if (key !== 'self') {
+          expect(store.dispatch).toHaveBeenCalledWith(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, value.href))
+        }
+      });
+    });
   });
 
-  describe('getBySelfLink', () => {
-    it('should return an observable of the cached object with the specified self link and type', () => {
-      spyOnProperty(ngrx, 'select').and.callFake(() => {
-        return () => {
-          return () => observableOf(cacheEntry);
-        };
+  describe('getByHref', () => {
+    describe('if getBySelfLink emits a valid object and getByAlternativeLink emits undefined', () => {
+      beforeEach(() => {
+        spyOn(service as any, 'getBySelfLink').and.returnValue(observableOf(cacheEntry));
+        spyOn(service as any, 'getByAlternativeLink').and.returnValue(observableOf(undefined));
       });
 
-      // due to the implementation of spyOn above, this subscribe will be synchronous
-      service.getObjectBySelfLink(selfLink).pipe(first()).subscribe((o) => {
-          expect(o._links.self.href).toBe(selfLink);
-          // this only works if testObj is an instance of TestClass
-          expect(o instanceof Item).toBeTruthy();
-        }
-      );
+      it('should return the object emitted by getBySelfLink', () => {
+        const result = service.getByHref(selfLink);
+        getTestScheduler().expectObservable(result).toBe('(a|)', { a: cacheEntry })
+      });
     });
 
-    it('should not return a cached object that has exceeded its time to live', () => {
-      spyOnProperty(ngrx, 'select').and.callFake(() => {
-        return () => {
-          return () => observableOf(invalidCacheEntry);
-        };
+    describe('if getBySelfLink emits undefined and getByAlternativeLink a valid object', () => {
+      beforeEach(() => {
+        spyOn(service as any, 'getBySelfLink').and.returnValue(observableOf(undefined));
+        spyOn(service as any, 'getByAlternativeLink').and.returnValue(observableOf(cacheEntry));
       });
 
-      let getObsHasFired = false;
-      const subscription = service.getObjectBySelfLink(selfLink).subscribe((o) => getObsHasFired = true);
-      expect(getObsHasFired).toBe(false);
-      subscription.unsubscribe();
+      it('should return the object emitted by getByAlternativeLink', () => {
+        const result = service.getByHref(selfLink);
+        getTestScheduler().expectObservable(result).toBe('(a|)', { a: cacheEntry })
+      });
+    });
+
+    describe('if getBySelfLink emits an invalid and getByAlternativeLink a valid object', () => {
+      beforeEach(() => {
+        spyOn(service as any, 'getBySelfLink').and.returnValue(observableOf(cacheEntry));
+        spyOn(service as any, 'getByAlternativeLink').and.returnValue(observableOf(cacheEntry2));
+      });
+
+      it('should return the object emitted by getByAlternativeLink', () => {
+        const result = service.getByHref(selfLink);
+        getTestScheduler().expectObservable(result).toBe('(a|)', { a: cacheEntry2 })
+      });
     });
   });
 
@@ -117,7 +162,7 @@ describe('ObjectCacheService', () => {
       const item = Object.assign(new Item(), {
         _links: { self: { href: selfLink } }
       });
-      spyOn(service, 'getObjectBySelfLink').and.returnValue(observableOf(item));
+      spyOn(service, 'getObjectByHref').and.returnValue(observableOf(item));
 
       service.getList([selfLink, selfLink]).pipe(first()).subscribe((arr) => {
         expect(arr[0]._links.self.href).toBe(selfLink);
@@ -127,34 +172,52 @@ describe('ObjectCacheService', () => {
   });
 
   describe('has', () => {
-    it('should return true if the object with the supplied self link is cached and still valid', () => {
-      spyOnProperty(ngrx, 'select').and.callFake(() => {
-        return () => {
-          return () => observableOf(cacheEntry);
-        };
+
+    describe('getByHref emits an object', () => {
+      beforeEach(() => {
+        spyOn(service, 'getByHref').and.returnValue(observableOf(cacheEntry))
       });
 
-      expect(service.hasBySelfLink(selfLink)).toBe(true);
+      it('should return true', () => {
+        expect(service.hasByHref(selfLink)).toBe(true);
+      });
     });
 
-    it('should return false if the object with the supplied self link isn\'t cached', () => {
+    describe('getByHref emits nothing', () => {
+      beforeEach(() => {
+        spyOn(service, 'getByHref').and.returnValue(empty())
+      });
+
+      it('should return false', () => {
+        expect(service.hasByHref(selfLink)).toBe(false);
+      });
+    })
+  });
+
+  describe('getBySelfLink', () => {
+    it('should return the entry returned by the select method', () => {
       spyOnProperty(ngrx, 'select').and.callFake(() => {
         return () => {
-          return () => observableOf(undefined);
+          return () => observableOf(cacheEntry);
         };
       });
 
-      expect(service.hasBySelfLink(selfLink)).toBe(false);
+      getTestScheduler().expectObservable((service as any).getBySelfLink(selfLink)).toBe('(a|)', { a: cacheEntry });
     });
+  });
 
-    it('should return false if the object with the supplied self link is cached but has exceeded its time to live', () => {
+  describe('getByAlternativeLink', () => {
+    beforeEach(() => {
+      spyOn(service as any, 'getBySelfLink').and.returnValue(observableOf(cacheEntry));
+    });
+    it('should call getBySelfLink with the value returned by the select method', () => {
       spyOnProperty(ngrx, 'select').and.callFake(() => {
         return () => {
-          return () => observableOf(invalidCacheEntry);
+          return () => observableOf(anotherLink);
         };
       });
-
-      expect(service.hasBySelfLink(selfLink)).toBe(false);
+      (service as any).getByAlternativeLink(selfLink).subscribe();
+      expect((service as any).getBySelfLink).toHaveBeenCalledWith(anotherLink);
     });
   });
 
@@ -169,7 +232,8 @@ describe('ObjectCacheService', () => {
       cacheEntry.patches = [
         {
           operations: operations
-        } as Patch];
+        } as Patch
+      ];
       const result = (service as any).isDirty(cacheEntry);
       expect(result).toBe(true);
     });
diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts
index d82a1f31fed..2bedc44b474 100644
--- a/src/app/core/cache/object-cache.service.ts
+++ b/src/app/core/cache/object-cache.service.ts
@@ -1,14 +1,17 @@
 import { Injectable } from '@angular/core';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { applyPatch, Operation } from 'fast-json-patch';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 
-import { distinctUntilChanged, filter, map, mergeMap, take, } from 'rxjs/operators';
-import { hasNoValue, isNotEmpty } from '../../shared/empty.util';
+import { distinctUntilChanged, filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
+import { hasValue, isNotEmpty, isEmpty } from '../../shared/empty.util';
 import { CoreState } from '../core.reducers';
 import { coreSelector } from '../core.selectors';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { selfLinkFromUuidSelector } from '../index/index.selectors';
+import {
+  selfLinkFromAlternativeLinkSelector,
+  selfLinkFromUuidSelector
+} from '../index/index.selectors';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { getClassForType } from './builders/build-decorators';
 import { LinkService } from './builders/link.service';
@@ -21,6 +24,9 @@ import {
 
 import { CacheableObject, ObjectCacheEntry, ObjectCacheState } from './object-cache.reducer';
 import { AddToSSBAction } from './server-sync-buffer.actions';
+import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import { IndexName } from '../index/index.reducer';
+import { HALLink } from '../shared/hal-link.model';
 
 /**
  * The base selector function to select the object cache in the store
@@ -60,10 +66,12 @@ export class ObjectCacheService {
    *    The number of milliseconds it should be cached for
    * @param requestUUID
    *    The UUID of the request that resulted in this object
+   * @param alternativeLink
+   *    An optional alternative link to this object
    */
-  add(object: CacheableObject, msToLive: number, requestUUID: string): void {
+  add(object: CacheableObject, msToLive: number, requestUUID: string, alternativeLink?: string): void {
     object = this.linkService.removeResolvedLinks(object); // Ensure the object we're storing has no resolved links
-    this.store.dispatch(new AddToObjectCacheAction(object, new Date().getTime(), msToLive, requestUUID));
+    this.store.dispatch(new AddToObjectCacheAction(object, new Date().getTime(), msToLive, requestUUID, alternativeLink));
   }
 
   /**
@@ -73,9 +81,33 @@ export class ObjectCacheService {
    *    The unique href of the object to be removed
    */
   remove(href: string): void {
+    this.removeRelatedLinksFromIndex(href);
     this.store.dispatch(new RemoveFromObjectCacheAction(href));
   }
 
+  private removeRelatedLinksFromIndex(href: string) {
+    const cacheEntry$ = this.getByHref(href);
+    const altLinks$ = cacheEntry$.pipe(map((entry: ObjectCacheEntry) => entry.alternativeLinks), take(1));
+    const childLinks$ = cacheEntry$.pipe(map((entry: ObjectCacheEntry) => {
+        return Object
+          .entries(entry.data._links)
+          .filter(([key, value]: [string, HALLink]) => key !== 'self')
+          .map(([key, value]: [string, HALLink]) => value.href);
+      }),
+      take(1)
+    );
+    this.removeLinksFromAlternativeLinkIndex(altLinks$);
+    this.removeLinksFromAlternativeLinkIndex(childLinks$);
+
+  }
+
+  private removeLinksFromAlternativeLinkIndex(links$: Observable<string[]>) {
+    links$.subscribe((links: string[]) => links.forEach((link: string) => {
+        this.store.dispatch(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link));
+      }
+    ))
+  }
+
   /**
    * Get an observable of the object with the specified UUID
    *
@@ -88,7 +120,7 @@ export class ObjectCacheService {
     Observable<T> {
     return this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
-      mergeMap((selfLink: string) => this.getObjectBySelfLink<T>(selfLink)
+      mergeMap((selfLink: string) => this.getObjectByHref<T>(selfLink)
       )
     )
   }
@@ -96,13 +128,13 @@ export class ObjectCacheService {
   /**
    * Get an observable of the object with the specified selfLink
    *
-   * @param selfLink
-   *    The selfLink of the object to get
+   * @param href
+   *    The href of the object to get
    * @return Observable<T>
    *    An observable of the requested object
    */
-  getObjectBySelfLink<T extends CacheableObject>(selfLink: string): Observable<T> {
-    return this.getBySelfLink(selfLink).pipe(
+  getObjectByHref<T extends CacheableObject>(href: string): Observable<T> {
+    return this.getByHref(href).pipe(
       map((entry: ObjectCacheEntry) => {
           if (isNotEmpty(entry.patches)) {
             const flatPatch: Operation[] = [].concat(...entry.patches.map((patch) => patch.operations));
@@ -126,19 +158,34 @@ export class ObjectCacheService {
   /**
    * Get an observable of the object cache entry with the specified selfLink
    *
-   * @param selfLink
-   *    The selfLink of the object to get
+   * @param href
+   *    The href of the object to get
    * @return Observable<ObjectCacheEntry>
    *    An observable of the requested object cache entry
    */
-  getBySelfLink(selfLink: string): Observable<ObjectCacheEntry> {
+  getByHref(href: string): Observable<ObjectCacheEntry> {
+    return observableCombineLatest([
+      this.getByAlternativeLink(href),
+      this.getBySelfLink(href),
+    ]).pipe(
+      map((results: ObjectCacheEntry[]) => results.find((entry: ObjectCacheEntry) => hasValue(entry))),
+      filter((entry: ObjectCacheEntry) => hasValue(entry))
+    );
+  }
+
+  private getBySelfLink(selfLink: string): Observable<ObjectCacheEntry> {
     return this.store.pipe(
       select(entryFromSelfLinkSelector(selfLink)),
-      filter((entry) => this.isValid(entry)),
-      distinctUntilChanged()
     );
   }
 
+  private getByAlternativeLink(alternativeLink: string): Observable<ObjectCacheEntry> {
+    return this.store.pipe(
+      select(selfLinkFromAlternativeLinkSelector(alternativeLink)),
+      switchMap((selfLink) => this.getBySelfLink(selfLink)),
+    )
+  }
+
   /**
    * Get an observable of the request's uuid with the specified selfLink
    *
@@ -148,7 +195,7 @@ export class ObjectCacheService {
    *    An observable of the request's uuid
    */
   getRequestUUIDBySelfLink(selfLink: string): Observable<string> {
-    return this.getBySelfLink(selfLink).pipe(
+    return this.getByHref(selfLink).pipe(
       map((entry: ObjectCacheEntry) => entry.requestUUID),
       distinctUntilChanged());
   }
@@ -188,9 +235,13 @@ export class ObjectCacheService {
    * @return Observable<Array<T>>
    */
   getList<T extends CacheableObject>(selfLinks: string[]): Observable<T[]> {
-    return observableCombineLatest(
-      selfLinks.map((selfLink: string) => this.getObjectBySelfLink<T>(selfLink))
-    );
+    if (isEmpty(selfLinks)) {
+      return observableOf([]);
+    } else {
+      return observableCombineLatest(
+        selfLinks.map((selfLink: string) => this.getObjectByHref<T>(selfLink))
+      );
+    }
   }
 
   /**
@@ -209,68 +260,53 @@ export class ObjectCacheService {
     this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
       take(1)
-    ).subscribe((selfLink: string) => result = this.hasBySelfLink(selfLink));
+    ).subscribe((selfLink: string) => result = this.hasByHref(selfLink));
 
     return result;
   }
 
   /**
-   * Check whether the object with the specified self link is cached
+   * Check whether the object with the specified self link is cached. Note that it doesn't check
+   * whether the response this object came in on is still valid. Just whether it exists.
    *
-   * @param selfLink
-   *    The self link of the object to check
+   * @param href
+   *    The href of the object to check
+   * @param requestUUID
+   *    Optional. If the object exists, check whether it links back to this requestUUID
    * @return boolean
-   *    true if the object with the specified self link is cached,
+   *    true if the object with the specified href is cached,
    *    false otherwise
    */
-  hasBySelfLink(selfLink: string): boolean {
+  hasByHref(href: string, requestUUID?: string): boolean {
     let result = false;
-
-    this.store.pipe(select(entryFromSelfLinkSelector(selfLink)),
-      take(1)
-    ).subscribe((entry: ObjectCacheEntry) => result = this.isValid(entry));
-
+    this.getByHref(href).subscribe((entry: ObjectCacheEntry) => {
+      if (isNotEmpty(requestUUID)) {
+        result = entry.requestUUID === requestUUID;
+      } else {
+        result = true;
+      }
+    }).unsubscribe();
     return result;
   }
 
   /**
    * Create an observable that emits a new value whenever the availability of the cached object changes.
    * The value it emits is a boolean stating if the object exists in cache or not.
-   * @param selfLink  The self link of the object to observe
+   * @param href The self link of the object to observe
    */
-  hasBySelfLinkObservable(selfLink: string): Observable<boolean> {
-    return this.store.pipe(
-      select(entryFromSelfLinkSelector(selfLink)),
-      map((entry: ObjectCacheEntry) => this.isValid(entry))
+  hasByHref$(href: string): Observable<boolean> {
+    return observableCombineLatest(
+      this.getBySelfLink(href),
+      this.getByAlternativeLink(href)
+    ).pipe(
+      map((entries: ObjectCacheEntry[]) => entries.some((entry) => hasValue(entry)))
     );
   }
 
-  /**
-   * Check whether an ObjectCacheEntry should still be cached
-   *
-   * @param entry
-   *    the entry to check
-   * @return boolean
-   *    false if the entry is null, undefined, or its time to
-   *    live has been exceeded, true otherwise
-   */
-  private isValid(entry: ObjectCacheEntry): boolean {
-    if (hasNoValue(entry)) {
-      return false;
-    } else {
-      const timeOutdated = entry.timeAdded + entry.msToLive;
-      const isOutDated = new Date().getTime() > timeOutdated;
-      if (isOutDated) {
-        this.store.dispatch(new RemoveFromObjectCacheAction(entry.data._links.self.href));
-      }
-      return !isOutDated;
-    }
-  }
-
   /**
    * Add operations to the existing list of operations for an ObjectCacheEntry
    * Makes sure the ServerSyncBuffer for this ObjectCacheEntry is updated
-   * @param {string} uuid
+   * @param selfLink
    *     the uuid of the ObjectCacheEntry
    * @param {Operation[]} patch
    *     list of operations to perform
@@ -295,8 +331,8 @@ export class ObjectCacheService {
   /**
    * Apply the existing operations on an ObjectCacheEntry in the store
    * NB: this does not make any server side changes
-   * @param {string} uuid
-   *     the uuid of the ObjectCacheEntry
+   * @param selfLink
+   *     the link of the ObjectCacheEntry
    */
   private applyPatchesToCachedObject(selfLink: string) {
     this.store.dispatch(new ApplyPatchObjectCacheAction(selfLink));
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 3f46ecf6478..3c7c2728300 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,25 +1,14 @@
-import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
-import { AuthStatus } from '../auth/models/auth-status.model';
 import { RequestError } from '../data/request.models';
 import { PageInfo } from '../shared/page-info.model';
 import { ConfigObject } from '../config/models/config.model';
-import { FacetValue } from '../../shared/search/facet-value.model';
-import { SearchFilterConfig } from '../../shared/search/search-filter-config.model';
-import { IntegrationModel } from '../integration/models/integration.model';
-import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
-import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
-import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
-import { PaginatedList } from '../data/paginated-list';
-import { SubmissionObject } from '../submission/models/submission-object.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { ContentSource } from '../shared/content-source.model';
+import { HALLink } from '../shared/hal-link.model';
+import { UnCacheableObject } from '../shared/uncacheable-object.model';
 
 /* tslint:disable:max-classes-per-file */
 export class RestResponse {
   public toCache = true;
-  public timeAdded: number;
+  public timeCompleted: number;
 
   constructor(
     public isSuccessful: boolean,
@@ -29,88 +18,15 @@ export class RestResponse {
   }
 }
 
-export class DSOSuccessResponse extends RestResponse {
-  constructor(
-    public resourceSelfLinks: string[],
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-/**
- * A successful response containing a list of MetadataSchemas wrapped in a RegistryMetadataschemasResponse
- */
-export class RegistryMetadataschemasSuccessResponse extends RestResponse {
-  constructor(
-    public metadataschemasResponse: RegistryMetadataschemasResponse,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
+export class ParsedResponse extends RestResponse {
+  constructor(statusCode: number, public link?: HALLink, public unCacheableObject?: UnCacheableObject) {
+    super(true, statusCode, `${statusCode}`);
   }
 }
 
-/**
- * A successful response containing a list of MetadataFields wrapped in a RegistryMetadatafieldsResponse
- */
-export class RegistryMetadatafieldsSuccessResponse extends RestResponse {
-  constructor(
-    public metadatafieldsResponse: RegistryMetadatafieldsResponse,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-/**
- * A successful response containing a list of BitstreamFormats wrapped in a RegistryBitstreamformatsResponse
- */
-export class RegistryBitstreamformatsSuccessResponse extends RestResponse {
-  constructor(
-    public bitstreamformatsResponse: RegistryBitstreamformatsResponse,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-/**
- * A successful response containing exactly one MetadataSchema
- */
-export class MetadataschemaSuccessResponse extends RestResponse {
-  constructor(
-    public metadataschema: MetadataSchema,
-    public statusCode: number,
-    public statusText: string,
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-/**
- * A successful response containing exactly one MetadataField
- */
-export class MetadatafieldSuccessResponse extends RestResponse {
-  constructor(
-    public metadatafield: MetadataField,
-    public statusCode: number,
-    public statusText: string,
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-export class SearchSuccessResponse extends RestResponse {
+export class DSOSuccessResponse extends RestResponse {
   constructor(
-    public results: SearchQueryResponse,
+    public resourceSelfLinks: string[],
     public statusCode: number,
     public statusText: string,
     public pageInfo?: PageInfo
@@ -119,42 +35,8 @@ export class SearchSuccessResponse extends RestResponse {
   }
 }
 
-export class FacetConfigSuccessResponse extends RestResponse {
-  constructor(
-    public results: SearchFilterConfig[],
-    public statusCode: number,
-    public statusText: string,
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-export class FacetValueMap {
-  [name: string]: FacetValueSuccessResponse
-}
-
-export class FacetValueSuccessResponse extends RestResponse {
-  constructor(
-    public results: FacetValue[],
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo) {
-    super(true, statusCode, statusText);
-  }
-}
-
-export class FacetValueMapSuccessResponse extends RestResponse {
-  constructor(
-    public results: FacetValueMap,
-    public statusCode: number,
-    public statusText: string
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
 export class EndpointMap {
-  [linkPath: string]: string
+  [linkPath: string]: HALLink
 }
 
 export class EndpointMapSuccessResponse extends RestResponse {
@@ -167,17 +49,6 @@ export class EndpointMapSuccessResponse extends RestResponse {
   }
 }
 
-export class GenericSuccessResponse<T> extends RestResponse {
-  constructor(
-    public payload: T,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
 export class ErrorResponse extends RestResponse {
   errorMessage: string;
 
@@ -199,26 +70,17 @@ export class ConfigSuccessResponse extends RestResponse {
   }
 }
 
-export class AuthStatusResponse extends RestResponse {
-  public toCache = false;
-
-  constructor(
-    public response: AuthStatus,
-    public statusCode: number,
-    public statusText: string,
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-export class IntegrationSuccessResponse extends RestResponse {
+/**
+ * A REST Response containing a token
+ */
+export class TokenResponse extends RestResponse {
   constructor(
-    public dataDefinition: PaginatedList<IntegrationModel>,
+    public token: string,
+    public isSuccessful: boolean,
     public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
+    public statusText: string
   ) {
-    super(true, statusCode, statusText);
+    super(isSuccessful, statusCode, statusText);
   }
 }
 
@@ -233,17 +95,6 @@ export class PostPatchSuccessResponse extends RestResponse {
   }
 }
 
-export class SubmissionSuccessResponse extends RestResponse {
-  constructor(
-    public dataDefinition: Array<SubmissionObject | ConfigObject | string>,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
 export class EpersonSuccessResponse extends RestResponse {
   constructor(
     public epersonDefinition: DSpaceObject[],
@@ -289,17 +140,4 @@ export class FilteredDiscoveryQueryResponse extends RestResponse {
     super(true, statusCode, statusText);
   }
 }
-
-/**
- * A successful response containing exactly one MetadataSchema
- */
-export class ContentSourceSuccessResponse extends RestResponse {
-  constructor(
-    public contentsource: ContentSource,
-    public statusCode: number,
-    public statusText: string,
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
 /* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/cache/server-sync-buffer.effects.spec.ts b/src/app/core/cache/server-sync-buffer.effects.spec.ts
index 245b6f67d85..9d9d91d9a11 100644
--- a/src/app/core/cache/server-sync-buffer.effects.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.spec.ts
@@ -51,7 +51,7 @@ describe('ServerSyncBufferEffects', () => {
               });
               return observableOf(object);
             },
-            getBySelfLink: (link) => {
+            getByHref: (link) => {
               const object = Object.assign(new DSpaceObject(), {
                 _links: {
                   self: { href: link }
diff --git a/src/app/core/cache/server-sync-buffer.effects.ts b/src/app/core/cache/server-sync-buffer.effects.ts
index 7d57bb4433c..7d8766b096c 100644
--- a/src/app/core/cache/server-sync-buffer.effects.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.ts
@@ -90,7 +90,7 @@ export class ServerSyncBufferEffects {
    * @returns {Observable<Action>} ApplyPatchObjectCacheAction to be dispatched
    */
   private applyPatch(href: string): Observable<Action> {
-    const patchObject = this.objectCache.getBySelfLink(href).pipe(take(1));
+    const patchObject = this.objectCache.getByHref(href).pipe(take(1));
 
     return patchObject.pipe(
       map((entry: ObjectCacheEntry) => {
diff --git a/src/app/core/cache/server-sync-buffer.reducer.ts b/src/app/core/cache/server-sync-buffer.reducer.ts
index d79dd51da40..7b65db0fbb2 100644
--- a/src/app/core/cache/server-sync-buffer.reducer.ts
+++ b/src/app/core/cache/server-sync-buffer.reducer.ts
@@ -9,7 +9,7 @@ import { RestRequestMethod } from '../data/rest-request-method';
 
 /**
  * An entry in the ServerSyncBufferState
- * href: unique href of an ObjectCacheEntry
+ * href: unique href of an ServerSyncBufferEntry
  * method: RestRequestMethod type
  */
 export class ServerSyncBufferEntry {
@@ -48,6 +48,7 @@ export function serverSyncBufferReducer(state = initialState, action: ServerSync
     case ServerSyncBufferActionTypes.EMPTY: {
       return emptyServerSyncQueue(state, action as EmptySSBAction);
     }
+
     default: {
       return state;
     }
diff --git a/src/app/core/config/config-data.ts b/src/app/core/config/config-data.ts
deleted file mode 100644
index cb40514e455..00000000000
--- a/src/app/core/config/config-data.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { ConfigObject } from './models/config.model';
-
-/**
- * A class to represent the data retrieved by a configuration service
- */
-export class ConfigData {
-  constructor(
-    public pageInfo: PageInfo,
-    public payload: ConfigObject
-  ) {
-  }
-}
diff --git a/src/app/core/config/config-response-parsing.service.spec.ts b/src/app/core/config/config-response-parsing.service.spec.ts
deleted file mode 100644
index c0bc8b3212f..00000000000
--- a/src/app/core/config/config-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,267 +0,0 @@
-import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { ConfigSuccessResponse, ErrorResponse } from '../cache/response.models';
-import { CoreState } from '../core.reducers';
-import { PaginatedList } from '../data/paginated-list';
-import { ConfigRequest } from '../data/request.models';
-import { PageInfo } from '../shared/page-info.model';
-import { ConfigResponseParsingService } from './config-response-parsing.service';
-import { SubmissionDefinitionModel } from './models/config-submission-definition.model';
-import { SubmissionSectionModel } from './models/config-submission-section.model';
-
-describe('ConfigResponseParsingService', () => {
-  let service: ConfigResponseParsingService;
-
-  const store = {} as Store<CoreState>;
-  const objectCacheService = new ObjectCacheService(store, undefined);
-  let validResponse;
-  beforeEach(() => {
-    service = new ConfigResponseParsingService(objectCacheService);
-    validResponse = {
-      payload: {
-        id: 'traditional',
-        name: 'traditional',
-        type: 'submissiondefinition',
-        isDefault: true,
-        _links: {
-          sections: {
-            href: 'https://rest.api/config/submissiondefinitions/traditional/sections'
-          },
-          self: {
-            href: 'https://rest.api/config/submissiondefinitions/traditional'
-          }
-        },
-        _embedded: {
-          sections: {
-            page: {
-              number: 0,
-              size: 4,
-              totalPages: 1, totalElements: 4
-            },
-            _embedded: [
-              {
-                id: 'traditionalpageone', header: 'submit.progressbar.describe.stepone',
-                mandatory: true,
-                sectionType: 'submission-form',
-                visibility: {
-                  main: null,
-                  other: 'READONLY'
-                },
-                type: 'submissionsection',
-                _links: {
-                  self: {
-                    href: 'https://rest.api/config/submissionsections/traditionalpageone'
-                  },
-                  config: {
-                    href: 'https://rest.api/config/submissionforms/traditionalpageone'
-                  }
-                }
-              }, {
-                id: 'traditionalpagetwo',
-                header: 'submit.progressbar.describe.steptwo',
-                mandatory: true,
-                sectionType: 'submission-form',
-                visibility: {
-                  main: null,
-                  other: 'READONLY'
-                },
-                type: 'submissionsection',
-                _links: {
-                  self: {
-                    href: 'https://rest.api/config/submissionsections/traditionalpagetwo'
-                  },
-                  config: {
-                    href: 'https://rest.api/config/submissionforms/traditionalpagetwo'
-                  }
-                }
-              }, {
-                id: 'upload',
-                header: 'submit.progressbar.upload',
-                mandatory: false,
-                sectionType: 'upload',
-                visibility: {
-                  main: null,
-                  other: 'READONLY'
-                },
-                type: 'submissionsection',
-                _links: {
-                  self: {
-                    href: 'https://rest.api/config/submissionsections/upload'
-                  },
-                  config: {
-                    href: 'https://rest.api/config/submissionuploads/upload'
-                  }
-                }
-              }, {
-                id: 'license',
-                header: 'submit.progressbar.license',
-                mandatory: true,
-                sectionType: 'license',
-                visibility: {
-                  main: null,
-                  other: 'READONLY'
-                },
-                type: 'submissionsection',
-                _links: {
-                  self: {
-                    href: 'https://rest.api/config/submissionsections/license'
-                  }
-                }
-              }
-            ],
-            _links: {
-              self: {
-                href: 'https://rest.api/config/submissiondefinitions/traditional/sections'
-              }
-            }
-          }
-        }
-      },
-      statusCode: 200,
-      statusText: 'OK'
-    };
-  });
-
-  describe('parse', () => {
-    const validRequest = new ConfigRequest('69f375b5-19f4-4453-8c7a-7dc5c55aafbb', 'https://rest.api/config/submissiondefinitions/traditional');
-
-    const invalidResponse1 = {
-      payload: {},
-      statusCode: 200,
-      statusText: 'OK'
-    };
-
-    const invalidResponse2 = {
-      payload: {
-        id: 'traditional',
-        name: 'traditional',
-        type: 'submissiondefinition',
-        isDefault: true,
-        _links: {},
-        _embedded: {
-          sections: {
-            page: {
-              number: 0,
-              size: 4,
-              totalPages: 1, totalElements: 4
-            },
-            _embedded: [{}, {}],
-            _links: {
-              self: { href: 'https://rest.api/config/submissiondefinitions/traditional/sections' }
-            }
-          }
-        }
-      },
-      statusCode: 200,
-      statusText: 'OK'
-    };
-
-    const invalidResponse3 = {
-      payload: {
-        _links: { self: { href: 'https://rest.api/config/submissiondefinitions/traditional' } },
-        page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-      }, statusCode: 500, statusText: 'Internal Server Error'
-    };
-    const pageinfo = Object.assign(new PageInfo(), {
-      elementsPerPage: 4,
-      totalElements: 4,
-      totalPages: 1,
-      currentPage: 1,
-      _links: {
-        self: {
-          href: 'https://rest.api/config/submissiondefinitions/traditional/sections'
-        },
-      },
-    });
-    const definitions =
-      Object.assign(new SubmissionDefinitionModel(), {
-        isDefault: true,
-        name: 'traditional',
-        type: 'submissiondefinition',
-        _links: {
-          sections: { href: 'https://rest.api/config/submissiondefinitions/traditional/sections' },
-          self: { href: 'https://rest.api/config/submissiondefinitions/traditional' }
-        },
-        sections: new PaginatedList(pageinfo, [
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.describe.stepone',
-            mandatory: true,
-            sectionType: 'submission-form',
-            visibility: {
-              main: null,
-              other: 'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {
-              self: { href: 'https://rest.api/config/submissionsections/traditionalpageone' },
-              config: { href: 'https://rest.api/config/submissionforms/traditionalpageone' }
-            },
-          }),
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.describe.steptwo',
-            mandatory: true,
-            sectionType: 'submission-form',
-            visibility: {
-              main: null,
-              other: 'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {
-              self: { href: 'https://rest.api/config/submissionsections/traditionalpagetwo' },
-              config: { href: 'https://rest.api/config/submissionforms/traditionalpagetwo' }
-            },
-          }),
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.upload',
-            mandatory: false,
-            sectionType: 'upload',
-            visibility: {
-              main: null,
-              other: 'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {
-              self: { href: 'https://rest.api/config/submissionsections/upload' },
-              config: { href: 'https://rest.api/config/submissionuploads/upload' }
-            },
-          }),
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.license',
-            mandatory: true,
-            sectionType: 'license',
-            visibility: {
-              main: null,
-              other: 'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {
-              self: { href: 'https://rest.api/config/submissionsections/license' }
-            },
-          })
-        ])
-      });
-
-    it('should return a ConfigSuccessResponse if data contains a valid config endpoint response', () => {
-      const response = service.parse(validRequest, validResponse);
-      expect(response.constructor).toBe(ConfigSuccessResponse);
-    });
-
-    it('should return an ErrorResponse if data contains an invalid config endpoint response', () => {
-      const response1 = service.parse(validRequest, invalidResponse1);
-      const response2 = service.parse(validRequest, invalidResponse2);
-      expect(response1.constructor).toBe(ErrorResponse);
-      expect(response2.constructor).toBe(ErrorResponse);
-    });
-
-    it('should return an ErrorResponse if data contains a statuscode other than 200', () => {
-      const response = service.parse(validRequest, invalidResponse3);
-      expect(response.constructor).toBe(ErrorResponse);
-    });
-
-    it('should return a ConfigSuccessResponse with the ConfigDefinitions in data', () => {
-      const response = service.parse(validRequest, validResponse);
-      expect((response as any).configDefinition).toEqual(definitions);
-    });
-
-  });
-});
diff --git a/src/app/core/config/config-response-parsing.service.ts b/src/app/core/config/config-response-parsing.service.ts
deleted file mode 100644
index a603de291ac..00000000000
--- a/src/app/core/config/config-response-parsing.service.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { ResponseParsingService } from '../data/parsing.service';
-import { RestRequest } from '../data/request.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { ConfigSuccessResponse, ErrorResponse, RestResponse } from '../cache/response.models';
-import { isNotEmpty } from '../../shared/empty.util';
-
-import { ConfigObject } from './models/config.model';
-import { BaseResponseParsingService } from '../data/base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-
-@Injectable()
-export class ConfigResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-  protected toCache = false;
-  protected shouldDirectlyAttachEmbeds = true;
-
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) { super();
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === 201 || data.statusCode === 200)) {
-      const configDefinition = this.process<ConfigObject>(data.payload, request);
-      return new ConfigSuccessResponse(configDefinition, data.statusCode, data.statusText, this.processPageInfo(data.payload));
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from config endpoint'),
-          { statusCode: data.statusCode, statusText: data.statusText }
-        )
-      );
-    }
-  }
-
-}
diff --git a/src/app/core/config/config.service.spec.ts b/src/app/core/config/config.service.spec.ts
index 80febb711f7..48027be1fce 100644
--- a/src/app/core/config/config.service.spec.ts
+++ b/src/app/core/config/config.service.spec.ts
@@ -1,11 +1,13 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
-import { ConfigRequest, FindListOptions } from '../data/request.models';
+import { FindListOptions, GetRequest } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 
 const LINK_NAME = 'test';
 const BROWSE = 'search/findByCollection';
@@ -16,8 +18,9 @@ class TestService extends ConfigService {
 
   constructor(
     protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
     protected halService: HALEndpointService) {
-    super();
+    super(requestService, rdbService, null, null, halService, null, null, null, BROWSE);
   }
 }
 
@@ -25,6 +28,7 @@ describe('ConfigService', () => {
   let scheduler: TestScheduler;
   let service: TestService;
   let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
   let halService: any;
 
   const findOptions: FindListOptions = new FindListOptions();
@@ -39,6 +43,7 @@ describe('ConfigService', () => {
   function initTestService(): TestService {
     return new TestService(
       requestService,
+      rdbService,
       halService
     );
   }
@@ -46,38 +51,16 @@ describe('ConfigService', () => {
   beforeEach(() => {
     scheduler = getTestScheduler();
     requestService = getMockRequestService();
+    rdbService = getMockRemoteDataBuildService();
     halService = new HALEndpointServiceStub(configEndpoint);
     service = initTestService();
   });
 
-  describe('getConfigByHref', () => {
+  describe('findByHref', () => {
 
-    it('should configure a new ConfigRequest', () => {
-      const expected = new ConfigRequest(requestService.generateRequestId(), scopedEndpoint);
-      scheduler.schedule(() => service.getConfigByHref(scopedEndpoint).subscribe());
-      scheduler.flush();
-
-      expect(requestService.configure).toHaveBeenCalledWith(expected);
-    });
-  });
-
-  describe('getConfigByName', () => {
-
-    it('should configure a new ConfigRequest', () => {
-      const expected = new ConfigRequest(requestService.generateRequestId(), scopedEndpoint);
-      scheduler.schedule(() => service.getConfigByName(scopeName).subscribe());
-      scheduler.flush();
-
-      expect(requestService.configure).toHaveBeenCalledWith(expected);
-    });
-  });
-
-  describe('getConfigBySearch', () => {
-
-    it('should configure a new ConfigRequest', () => {
-      findOptions.scopeID = scopeID;
-      const expected = new ConfigRequest(requestService.generateRequestId(), searchEndpoint);
-      scheduler.schedule(() => service.getConfigBySearch(findOptions).subscribe());
+    it('should configure a new GetRequest', () => {
+      const expected = new GetRequest(requestService.generateRequestId(), scopedEndpoint);
+      scheduler.schedule(() => service.findByHref(scopedEndpoint).subscribe());
       scheduler.flush();
 
       expect(requestService.configure).toHaveBeenCalledWith(expected);
diff --git a/src/app/core/config/config.service.ts b/src/app/core/config/config.service.ts
index db14c4a256b..aa8592044aa 100644
--- a/src/app/core/config/config.service.ts
+++ b/src/app/core/config/config.service.ts
@@ -1,107 +1,67 @@
-import { merge as observableMerge, Observable, throwError as observableThrowError } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 import { RequestService } from '../data/request.service';
-import { ConfigSuccessResponse } from '../cache/response.models';
-import { ConfigRequest, FindListOptions, RestRequest } from '../data/request.models';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ConfigData } from './config-data';
-import { getResponseFromEntry } from '../shared/operators';
-
-export abstract class ConfigService {
-  protected request: ConfigRequest;
-  protected abstract requestService: RequestService;
-  protected abstract linkPath: string;
-  protected abstract browseEndpoint: string;
-  protected abstract halService: HALEndpointService;
-
-  protected getConfig(request: RestRequest): Observable<ConfigData> {
-    const responses = this.requestService.getByHref(request.href).pipe(
-      getResponseFromEntry()
-    );
-    const errorResponses = responses.pipe(
-      filter((response) => !response.isSuccessful),
-      mergeMap(() => observableThrowError(new Error(`Couldn't retrieve the config`)))
-    );
-    const successResponses = responses.pipe(
-      filter((response) => response.isSuccessful && isNotEmpty(response) && isNotEmpty((response as ConfigSuccessResponse).configDefinition)),
-      map((response: ConfigSuccessResponse) => new ConfigData(response.pageInfo, response.configDefinition))
-    );
-    return observableMerge(errorResponses, successResponses);
-
-  }
-
-  protected getConfigByNameHref(endpoint, resourceName): string {
-    return `${endpoint}/${resourceName}`;
-  }
-
-  protected getConfigSearchHref(endpoint, options: FindListOptions = {}): string {
-    let result;
-    const args = [];
-
-    if (hasValue(options.scopeID)) {
-      result = `${endpoint}/${this.browseEndpoint}`;
-      args.push(`uuid=${options.scopeID}`);
-    } else {
-      result = endpoint;
-    }
-
-    if (hasValue(options.currentPage) && typeof options.currentPage === 'number') {
-      /* TODO: this is a temporary fix for the pagination start index (0 or 1) discrepancy between the rest and the frontend respectively */
-      args.push(`page=${options.currentPage - 1}`);
-    }
-
-    if (hasValue(options.elementsPerPage)) {
-      args.push(`size=${options.elementsPerPage}`);
-    }
-
-    if (hasValue(options.sort)) {
-      args.push(`sort=${options.sort.field},${options.sort.direction}`);
-    }
-
-    if (isNotEmpty(args)) {
-      result = `${result}?${args.join('&')}`;
-    }
-    return result;
-  }
-
-  public getConfigAll(): Observable<ConfigData> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      filter((href: string) => isNotEmpty(href)),
-      distinctUntilChanged(),
-      map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL)),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-      mergeMap((request: RestRequest) => this.getConfig(request)),
-      distinctUntilChanged());
-  }
-
-  public getConfigByHref(href: string): Observable<ConfigData> {
-    const request = new ConfigRequest(this.requestService.generateRequestId(), href);
-    this.requestService.configure(request);
-
-    return this.getConfig(request);
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ConfigObject } from './models/config.model';
+import { RemoteData } from '../data/remote-data';
+import { DataService } from '../data/data.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { map } from 'rxjs/operators';
+
+class DataServiceImpl extends DataService<ConfigObject> {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<ConfigObject>,
+    protected linkPath: string
+  ) {
+    super();
   }
+}
 
-  public getConfigByName(name: string): Observable<ConfigData> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getConfigByNameHref(endpoint, name)),
-      filter((href: string) => isNotEmpty(href)),
-      distinctUntilChanged(),
-      map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL)),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-      mergeMap((request: RestRequest) => this.getConfig(request)),
-      distinctUntilChanged());
+// tslint:disable-next-line:max-classes-per-file
+export abstract class ConfigService {
+  /**
+   * A private DataService instance to delegate specific methods to.
+   */
+  private dataService: DataServiceImpl;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<ConfigObject>,
+    protected linkPath: string
+  ) {
+    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, this.linkPath);
   }
 
-  public getConfigBySearch(options: FindListOptions = {}): Observable<ConfigData> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getConfigSearchHref(endpoint, options)),
-      filter((href: string) => isNotEmpty(href)),
-      distinctUntilChanged(),
-      map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL)),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-      mergeMap((request: RestRequest) => this.getConfig(request)),
-      distinctUntilChanged());
+  public findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<ConfigObject>>): Observable<RemoteData<ConfigObject>> {
+    return this.dataService.findByHref(href, reRequestOnStale, ...linksToFollow).pipe(
+      getFirstCompletedRemoteData(),
+      map((rd: RemoteData<ConfigObject>) => {
+        if (rd.hasFailed) {
+          throw new Error(`Couldn't retrieve the config`);
+        } else {
+          return rd;
+        }
+      })
+    );
   }
-
 }
diff --git a/src/app/core/config/models/config-submission-definition.model.ts b/src/app/core/config/models/config-submission-definition.model.ts
index f3e888d5138..b07917e0328 100644
--- a/src/app/core/config/models/config-submission-definition.model.ts
+++ b/src/app/core/config/models/config-submission-definition.model.ts
@@ -1,10 +1,10 @@
 import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { typedObject } from '../../cache/builders/build-decorators';
-import { PaginatedList } from '../../data/paginated-list';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { HALLink } from '../../shared/hal-link.model';
-import { ResourceType } from '../../shared/resource-type';
 import { SubmissionSectionModel } from './config-submission-section.model';
 import { ConfigObject } from './config.model';
+import { SUBMISSION_DEFINITION_TYPE } from './config-type';
 
 /**
  * Class for the configuration describing the submission
@@ -12,7 +12,7 @@ import { ConfigObject } from './config.model';
 @typedObject
 @inheritSerialization(ConfigObject)
 export class SubmissionDefinitionModel extends ConfigObject {
-  static type = new ResourceType('submissiondefinition');
+  static type = SUBMISSION_DEFINITION_TYPE;
 
   /**
    * A boolean representing if this submission definition is the default or not
diff --git a/src/app/core/config/models/config-submission-definitions.model.ts b/src/app/core/config/models/config-submission-definitions.model.ts
index 1fdf5718069..08f1ef17bb0 100644
--- a/src/app/core/config/models/config-submission-definitions.model.ts
+++ b/src/app/core/config/models/config-submission-definitions.model.ts
@@ -1,11 +1,11 @@
 import { inheritSerialization } from 'cerialize';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionDefinitionModel } from './config-submission-definition.model';
-import { ResourceType } from '../../shared/resource-type';
+import { SUBMISSION_DEFINITIONS_TYPE } from './config-type';
 
 @typedObject
 @inheritSerialization(SubmissionDefinitionModel)
 export class SubmissionDefinitionsModel extends SubmissionDefinitionModel {
-  static type = new ResourceType('submissiondefinitions');
+  static type = SUBMISSION_DEFINITIONS_TYPE;
 
 }
diff --git a/src/app/core/config/models/config-submission-form.model.ts b/src/app/core/config/models/config-submission-form.model.ts
index d3fcfa97389..90f94882bd6 100644
--- a/src/app/core/config/models/config-submission-form.model.ts
+++ b/src/app/core/config/models/config-submission-form.model.ts
@@ -2,7 +2,7 @@ import { autoserialize, inheritSerialization } from 'cerialize';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { ConfigObject } from './config.model';
 import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
-import { ResourceType } from '../../shared/resource-type';
+import { SUBMISSION_FORM_TYPE } from './config-type';
 
 /**
  * An interface that define a form row and its properties.
@@ -17,7 +17,7 @@ export interface FormRowModel {
 @typedObject
 @inheritSerialization(ConfigObject)
 export class SubmissionFormModel extends ConfigObject {
-  static type = new ResourceType('submissionform');
+  static type = SUBMISSION_FORM_TYPE;
 
   /**
    * An array of [FormRowModel] that are present in this form
diff --git a/src/app/core/config/models/config-submission-forms.model.ts b/src/app/core/config/models/config-submission-forms.model.ts
index 8130bf32647..506905d88cb 100644
--- a/src/app/core/config/models/config-submission-forms.model.ts
+++ b/src/app/core/config/models/config-submission-forms.model.ts
@@ -1,7 +1,7 @@
 import { inheritSerialization } from 'cerialize';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionFormModel } from './config-submission-form.model';
-import { ResourceType } from '../../shared/resource-type';
+import { SUBMISSION_FORMS_TYPE } from './config-type';
 
 /**
  * A model class for a NormalizedObject.
@@ -9,5 +9,5 @@ import { ResourceType } from '../../shared/resource-type';
 @typedObject
 @inheritSerialization(SubmissionFormModel)
 export class SubmissionFormsModel extends SubmissionFormModel {
-  static type = new ResourceType('submissionforms');
+  static type = SUBMISSION_FORMS_TYPE;
 }
diff --git a/src/app/core/config/models/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
index d8249297b1a..cb89b3be948 100644
--- a/src/app/core/config/models/config-submission-section.model.ts
+++ b/src/app/core/config/models/config-submission-section.model.ts
@@ -2,8 +2,8 @@ import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { SectionsType } from '../../../submission/sections/sections-type';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { HALLink } from '../../shared/hal-link.model';
-import { ResourceType } from '../../shared/resource-type';
 import { ConfigObject } from './config.model';
+import { SUBMISSION_SECTION_TYPE } from './config-type';
 
 /**
  * An interface that define section visibility and its properties.
@@ -16,7 +16,7 @@ export interface SubmissionSectionVisibility {
 @typedObject
 @inheritSerialization(ConfigObject)
 export class SubmissionSectionModel extends ConfigObject {
-  static type = new ResourceType('submissionsection');
+  static type = SUBMISSION_SECTION_TYPE;
 
   /**
    * The header for this section
diff --git a/src/app/core/config/models/config-submission-sections.model.ts b/src/app/core/config/models/config-submission-sections.model.ts
index 7f787122731..423ea99b1e1 100644
--- a/src/app/core/config/models/config-submission-sections.model.ts
+++ b/src/app/core/config/models/config-submission-sections.model.ts
@@ -1,10 +1,10 @@
 import { inheritSerialization } from 'cerialize';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionSectionModel } from './config-submission-section.model';
-import { ResourceType } from '../../shared/resource-type';
+import { SUBMISSION_SECTIONS_TYPE } from './config-type';
 
 @typedObject
 @inheritSerialization(SubmissionSectionModel)
 export class SubmissionSectionsModel extends SubmissionSectionModel {
-  static type = new ResourceType('submissionsections');
+  static type = SUBMISSION_SECTIONS_TYPE;
 }
diff --git a/src/app/core/config/models/config-submission-upload.model.ts b/src/app/core/config/models/config-submission-upload.model.ts
new file mode 100644
index 00000000000..b08149659e3
--- /dev/null
+++ b/src/app/core/config/models/config-submission-upload.model.ts
@@ -0,0 +1,39 @@
+import { autoserialize, inheritSerialization, deserialize } from 'cerialize';
+import { typedObject, link } from '../../cache/builders/build-decorators';
+import { ConfigObject } from './config.model';
+import { AccessConditionOption } from './config-access-condition-option.model';
+import { SubmissionFormsModel } from './config-submission-forms.model';
+import { SUBMISSION_UPLOAD_TYPE, SUBMISSION_FORMS_TYPE } from './config-type';
+import { HALLink } from '../../shared/hal-link.model';
+import { RemoteData } from '../../data/remote-data';
+import { Observable } from 'rxjs';
+
+@typedObject
+@inheritSerialization(ConfigObject)
+export class SubmissionUploadModel extends ConfigObject {
+  static type =  SUBMISSION_UPLOAD_TYPE;
+  /**
+   * A list of available bitstream access conditions
+   */
+  @autoserialize
+  accessConditionOptions: AccessConditionOption[];
+
+  /**
+   * An object representing the configuration describing the bitstream metadata form
+   */
+  @link(SUBMISSION_FORMS_TYPE)
+  metadata?: Observable<RemoteData<SubmissionFormsModel>>;
+
+  @autoserialize
+  required: boolean;
+
+  @autoserialize
+  maxSize: number;
+
+  @deserialize
+  _links: {
+    metadata: HALLink
+    self: HALLink
+  }
+
+}
diff --git a/src/app/core/config/models/config-submission-uploads.model.ts b/src/app/core/config/models/config-submission-uploads.model.ts
index b7733ee25d3..8fb7dc66b9c 100644
--- a/src/app/core/config/models/config-submission-uploads.model.ts
+++ b/src/app/core/config/models/config-submission-uploads.model.ts
@@ -1,30 +1,10 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import { inheritSerialization } from 'cerialize';
 import { typedObject } from '../../cache/builders/build-decorators';
-import { ConfigObject } from './config.model';
-import { AccessConditionOption } from './config-access-condition-option.model';
-import { SubmissionFormsModel } from './config-submission-forms.model';
-import { ResourceType } from '../../shared/resource-type';
+import { SUBMISSION_UPLOADS_TYPE } from './config-type';
+import { SubmissionUploadModel } from './config-submission-upload.model';
 
 @typedObject
-@inheritSerialization(ConfigObject)
-export class SubmissionUploadsModel extends ConfigObject {
-  static type =  new ResourceType('submissionupload');
-  /**
-   * A list of available bitstream access conditions
-   */
-  @autoserialize
-  accessConditionOptions: AccessConditionOption[];
-
-  /**
-   * An object representing the configuration describing the bistream metadata form
-   */
-  @autoserialize
-  metadata: SubmissionFormsModel;
-
-  @autoserialize
-  required: boolean;
-
-  @autoserialize
-  maxSize: number;
-
+@inheritSerialization(SubmissionUploadModel)
+export class SubmissionUploadsModel extends SubmissionUploadModel {
+  static type =  SUBMISSION_UPLOADS_TYPE;
 }
diff --git a/src/app/core/config/models/config-type.ts b/src/app/core/config/models/config-type.ts
index 91371f10f59..858ff19c91d 100644
--- a/src/app/core/config/models/config-type.ts
+++ b/src/app/core/config/models/config-type.ts
@@ -1,10 +1,17 @@
-export enum ConfigType {
-  SubmissionDefinitions = 'submissiondefinitions',
-  SubmissionDefinition = 'submissiondefinition',
-  SubmissionForm = 'submissionform',
-  SubmissionForms = 'submissionforms',
-  SubmissionSections = 'submissionsections',
-  SubmissionSection = 'submissionsection',
-  SubmissionUploads = 'submissionuploads',
-  SubmissionUpload = 'submissionupload',
-}
+import { ResourceType } from '../../shared/resource-type';
+
+export const SUBMISSION_DEFINITIONS_TYPE = new ResourceType('submissiondefinitions');
+
+export const SUBMISSION_DEFINITION_TYPE = new ResourceType('submissiondefinition');
+
+export const SUBMISSION_FORM_TYPE = new ResourceType('submissionform');
+
+export const SUBMISSION_FORMS_TYPE = new ResourceType('submissionforms');
+
+export const SUBMISSION_SECTIONS_TYPE = new ResourceType('submissionsections');
+
+export const SUBMISSION_SECTION_TYPE = new ResourceType('submissionsection');
+
+export const SUBMISSION_UPLOADS_TYPE = new ResourceType('submissionuploads');
+
+export const SUBMISSION_UPLOAD_TYPE = new ResourceType('submissionupload');
diff --git a/src/app/core/config/models/config.model.ts b/src/app/core/config/models/config.model.ts
index fabb16eb233..53250ee045e 100644
--- a/src/app/core/config/models/config.model.ts
+++ b/src/app/core/config/models/config.model.ts
@@ -6,6 +6,12 @@ import { excludeFromEquals } from '../../utilities/equals.decorators';
 
 export abstract class ConfigObject implements CacheableObject {
 
+  /**
+   * The name for this configuration
+   */
+  @autoserialize
+  public id: string;
+
   /**
    * The name for this configuration
    */
diff --git a/src/app/core/config/submission-definitions-config.service.ts b/src/app/core/config/submission-definitions-config.service.ts
deleted file mode 100644
index b7b0873c21c..00000000000
--- a/src/app/core/config/submission-definitions-config.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-
-import { ConfigService } from './config.service';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-
-@Injectable()
-export class SubmissionDefinitionsConfigService extends ConfigService {
-  protected linkPath = 'submissiondefinitions';
-  protected browseEndpoint = 'search/findByCollection';
-
-  constructor(
-    protected requestService: RequestService,
-    protected halService: HALEndpointService) {
-    super();
-  }
-
-}
diff --git a/src/app/core/config/submission-forms-config.service.ts b/src/app/core/config/submission-forms-config.service.ts
index b688859ec99..25c39d915b8 100644
--- a/src/app/core/config/submission-forms-config.service.ts
+++ b/src/app/core/config/submission-forms-config.service.ts
@@ -3,16 +3,38 @@ import { Injectable } from '@angular/core';
 import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { ConfigObject } from './models/config.model';
+import { dataService } from '../cache/builders/build-decorators';
+import { SUBMISSION_FORMS_TYPE } from './models/config-type';
+import { SubmissionFormsModel } from './models/config-submission-forms.model';
+import { RemoteData } from '../data/remote-data';
+import { Observable } from 'rxjs';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 
 @Injectable()
+@dataService(SUBMISSION_FORMS_TYPE)
 export class SubmissionFormsConfigService extends ConfigService {
-  protected linkPath = 'submissionforms';
-  protected browseEndpoint = '';
-
   constructor(
     protected requestService: RequestService,
-    protected halService: HALEndpointService) {
-    super();
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<SubmissionFormsModel>
+  ) {
+    super(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, 'submissionforms');
   }
 
+  public findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<SubmissionFormsModel>>): Observable<RemoteData<SubmissionFormsModel>> {
+    return super.findByHref(href, reRequestOnStale, ...linksToFollow as Array<FollowLinkConfig<ConfigObject>>) as Observable<RemoteData<SubmissionFormsModel>>;
+  }
 }
diff --git a/src/app/core/config/submission-sections-config.service.ts b/src/app/core/config/submission-sections-config.service.ts
deleted file mode 100644
index c8bbc0dd975..00000000000
--- a/src/app/core/config/submission-sections-config.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-
-import { ConfigService } from './config.service';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-
-@Injectable()
-export class SubmissionSectionsConfigService extends ConfigService {
-  protected linkPath = 'submissionsections';
-  protected browseEndpoint = '';
-
-  constructor(
-    protected requestService: RequestService,
-    protected halService: HALEndpointService) {
-    super();
-  }
-
-}
diff --git a/src/app/core/config/submission-uploads-config.service.ts b/src/app/core/config/submission-uploads-config.service.ts
index 2e092fa4f34..b8b5caf6136 100644
--- a/src/app/core/config/submission-uploads-config.service.ts
+++ b/src/app/core/config/submission-uploads-config.service.ts
@@ -3,19 +3,40 @@ import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../cache/builders/build-decorators';
+import { SUBMISSION_UPLOADS_TYPE } from './models/config-type';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { ConfigObject } from './models/config.model';
+import { SubmissionUploadsModel } from './models/config-submission-uploads.model';
+import { RemoteData } from '../data/remote-data';
+import { Observable } from 'rxjs';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
  */
 @Injectable()
+@dataService(SUBMISSION_UPLOADS_TYPE)
 export class SubmissionUploadsConfigService extends ConfigService {
-  protected linkPath = 'submissionuploads';
-  protected browseEndpoint = '';
-
   constructor(
-    protected objectCache: ObjectCacheService,
     protected requestService: RequestService,
-    protected halService: HALEndpointService) {
-    super();
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<SubmissionUploadsModel>
+  ) {
+    super(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, 'submissionuploads');
+  }
+
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow): Observable<RemoteData<SubmissionUploadsModel>> {
+    return super.findByHref(href, reRequestOnStale, ...linksToFollow as Array<FollowLinkConfig<ConfigObject>>) as Observable<RemoteData<SubmissionUploadsModel>>;
   }
 }
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index 9f4242cc9ad..cd14a527e87 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -7,6 +7,7 @@ import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
 import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
 import { RouteEffects } from './services/route.effects';
 import { RouterEffects } from './router/router.effects';
+import { MenuEffects } from '../shared/menu/menu.effects';
 
 export const coreEffects = [
   RequestEffects,
@@ -17,5 +18,6 @@ export const coreEffects = [
   ServerSyncBufferEffects,
   ObjectUpdatesEffects,
   RouteEffects,
-  RouterEffects
+  RouterEffects,
+  MenuEffects
 ];
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 356dad5ed80..95e2726bcdc 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -13,12 +13,12 @@ import { FormBuilderService } from '../shared/form/builder/form-builder.service'
 import { FormService } from '../shared/form/form.service';
 import { HostWindowService } from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
-import { EndpointMockingRestService } from '../shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service';
+import { EndpointMockingRestService } from '../shared/mocks/dspace-rest/endpoint-mocking-rest.service';
 import {
   MOCK_RESPONSE_MAP,
-  ResponseMapMock,
-  mockResponseMap
-} from '../shared/mocks/dspace-rest-v2/mocks/response-map.mock';
+  mockResponseMap,
+  ResponseMapMock
+} from '../shared/mocks/dspace-rest/mocks/response-map.mock';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
 import { ObjectSelectService } from '../shared/object-select/object-select.service';
@@ -28,27 +28,20 @@ import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { UploaderService } from '../shared/uploader/uploader.service';
 import { SectionFormOperationsService } from '../submission/sections/form/section-form-operations.service';
 import { AuthRequestService } from './auth/auth-request.service';
-import { AuthResponseParsingService } from './auth/auth-response-parsing.service';
 import { AuthInterceptor } from './auth/auth.interceptor';
 import { AuthenticatedGuard } from './auth/authenticated.guard';
 import { AuthStatus } from './auth/models/auth-status.model';
 import { BrowseService } from './browse/browse.service';
 import { RemoteDataBuildService } from './cache/builders/remote-data-build.service';
 import { ObjectCacheService } from './cache/object-cache.service';
-import { ConfigResponseParsingService } from './config/config-response-parsing.service';
 import { SubmissionDefinitionsModel } from './config/models/config-submission-definitions.model';
 import { SubmissionFormsModel } from './config/models/config-submission-forms.model';
 import { SubmissionSectionModel } from './config/models/config-submission-section.model';
 import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model';
-import { SubmissionDefinitionsConfigService } from './config/submission-definitions-config.service';
 import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
-import { SubmissionSectionsConfigService } from './config/submission-sections-config.service';
 import { coreEffects } from './core.effects';
 import { coreReducers, CoreState } from './core.reducers';
 import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
-import { BrowseEntriesResponseParsingService } from './data/browse-entries-response-parsing.service';
-import { BrowseItemsResponseParsingService } from './data/browse-items-response-parsing-service';
-import { BrowseResponseParsingService } from './data/browse-response-parsing.service';
 import { CollectionDataService } from './data/collection-data.service';
 import { CommunityDataService } from './data/community-data.service';
 import { ContentSourceResponseParsingService } from './data/content-source-response-parsing.service';
@@ -62,33 +55,22 @@ import { ItemTypeDataService } from './data/entity-type-data.service';
 import { EntityTypeService } from './data/entity-type.service';
 import { ExternalSourceService } from './data/external-source.service';
 import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
-import { FacetValueMapResponseParsingService } from './data/facet-value-map-response-parsing.service';
 import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
 import { FilteredDiscoveryPageResponseParsingService } from './data/filtered-discovery-page-response-parsing.service';
 import { ItemDataService } from './data/item-data.service';
 import { LicenseDataService } from './data/license-data.service';
 import { LookupRelationService } from './data/lookup-relation.service';
-import { MappedCollectionsReponseParsingService } from './data/mapped-collections-reponse-parsing.service';
-import { MetadatafieldParsingService } from './data/metadatafield-parsing.service';
-import { MetadataschemaParsingService } from './data/metadataschema-parsing.service';
 import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
-import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service';
-import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service';
-import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service';
 import { RelationshipTypeService } from './data/relationship-type.service';
 import { RelationshipService } from './data/relationship.service';
-import { ResourcePolicyService } from './data/resource-policy.service';
+import { ResourcePolicyService } from './resource-policy/resource-policy.service';
 import { SearchResponseParsingService } from './data/search-response-parsing.service';
 import { SiteDataService } from './data/site-data.service';
-import { DSpaceRESTv2Service } from './dspace-rest-v2/dspace-rest-v2.service';
+import { DspaceRestService } from './dspace-rest/dspace-rest.service';
 import { EPersonDataService } from './eperson/eperson-data.service';
-import { EpersonResponseParsingService } from './eperson/eperson-response-parsing.service';
 import { EPerson } from './eperson/models/eperson.model';
 import { Group } from './eperson/models/group.model';
-import { AuthorityService } from './integration/authority.service';
-import { IntegrationResponseParsingService } from './integration/integration-response-parsing.service';
-import { AuthorityValue } from './integration/models/authority.value';
 import { JsonPatchOperationsBuilder } from './json-patch/builder/json-patch-operations-builder';
 import { MetadataField } from './metadata/metadata-field.model';
 import { MetadataSchema } from './metadata/metadata-schema.model';
@@ -116,7 +98,7 @@ import { RelationshipType } from './shared/item-relationships/relationship-type.
 import { Relationship } from './shared/item-relationships/relationship.model';
 import { Item } from './shared/item.model';
 import { License } from './shared/license.model';
-import { ResourcePolicy } from './shared/resource-policy.model';
+import { ResourcePolicy } from './resource-policy/models/resource-policy.model';
 import { SearchConfigurationService } from './shared/search/search-configuration.service';
 import { SearchFilterService } from './shared/search/search-filter.service';
 import { SearchService } from './shared/search/search.service';
@@ -143,8 +125,43 @@ import { VersionDataService } from './data/version-data.service';
 import { VersionHistoryDataService } from './data/version-history-data.service';
 import { Version } from './shared/version.model';
 import { VersionHistory } from './shared/version-history.model';
+import { Script } from '../process-page/scripts/script.model';
+import { Process } from '../process-page/processes/process.model';
+import { ProcessDataService } from './data/processes/process-data.service';
+import { ScriptDataService } from './data/processes/script-data.service';
 import { WorkflowActionDataService } from './data/workflow-action-data.service';
 import { WorkflowAction } from './tasks/models/workflow-action-object.model';
+import { LocaleInterceptor } from './locale/locale.interceptor';
+import { ItemTemplateDataService } from './data/item-template-data.service';
+import { TemplateItem } from './shared/template-item.model';
+import { Feature } from './shared/feature.model';
+import { Authorization } from './shared/authorization.model';
+import { FeatureDataService } from './data/feature-authorization/feature-data.service';
+import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
+import { SiteAdministratorGuard } from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { Registration } from './shared/registration.model';
+import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
+import { MetadataFieldDataService } from './data/metadata-field-data.service';
+import { TokenResponseParsingService } from './auth/token-response-parsing.service';
+import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
+import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
+import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model';
+import { SubmissionCcLicenseUrlDataService } from './submission/submission-cc-license-url-data.service';
+import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model';
+import { Vocabulary } from './submission/vocabularies/models/vocabulary.model';
+import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyService } from './submission/vocabularies/vocabulary.service';
+import { VocabularyTreeviewService } from '../shared/vocabulary-treeview/vocabulary-treeview.service';
+import { ConfigurationDataService } from './data/configuration-data.service';
+import { ConfigurationProperty } from './shared/configuration-property.model';
+import { ReloadGuard } from './reload/reload.guard';
+import { EndUserAgreementCurrentUserGuard } from './end-user-agreement/end-user-agreement-current-user.guard';
+import { EndUserAgreementCookieGuard } from './end-user-agreement/end-user-agreement-cookie.guard';
+import { EndUserAgreementService } from './end-user-agreement/end-user-agreement.service';
+import { SiteRegisterGuard } from './data/feature-authorization/feature-authorization-guard/site-register.guard';
+import { ShortLivedToken } from './auth/models/short-lived-token.model';
+import { UsageReport } from './statistics/models/usage-report.model';
+import { Root } from './data/root.model';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -152,7 +169,7 @@ import { WorkflowAction } from './tasks/models/workflow-action-object.model';
  */
 export const restServiceFactory = (mocks: ResponseMapMock, http: HttpClient) => {
   if (environment.production) {
-    return new DSpaceRESTv2Service(http);
+    return new DspaceRestService(http);
   } else {
     return new EndpointMockingRestService(mocks, http);
   }
@@ -172,20 +189,18 @@ const PROVIDERS = [
   ApiService,
   AuthenticatedGuard,
   AuthRequestService,
-  AuthResponseParsingService,
   CommunityDataService,
   CollectionDataService,
   SiteDataService,
   DSOResponseParsingService,
   { provide: MOCK_RESPONSE_MAP, useValue: mockResponseMap },
-  { provide: DSpaceRESTv2Service, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient]},
+  { provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient] },
   DynamicFormLayoutService,
   DynamicFormService,
   DynamicFormValidationService,
   FormBuilderService,
   SectionFormOperationsService,
   FormService,
-  EpersonResponseParsingService,
   EPersonDataService,
   HALEndpointService,
   HostWindowService,
@@ -199,32 +214,19 @@ const PROVIDERS = [
   RemoteDataBuildService,
   EndpointMapResponseParsingService,
   FacetValueResponseParsingService,
-  FacetValueMapResponseParsingService,
   FacetConfigResponseParsingService,
-  RegistryMetadataschemasResponseParsingService,
-  RegistryMetadatafieldsResponseParsingService,
-  RegistryBitstreamformatsResponseParsingService,
-  MappedCollectionsReponseParsingService,
   DebugResponseParsingService,
   SearchResponseParsingService,
   MyDSpaceResponseParsingService,
   ServerResponseService,
-  BrowseResponseParsingService,
-  BrowseEntriesResponseParsingService,
-  BrowseItemsResponseParsingService,
   BrowseService,
-  ConfigResponseParsingService,
-  SubmissionDefinitionsConfigService,
+  SubmissionCcLicenseDataService,
+  SubmissionCcLicenseUrlDataService,
   SubmissionFormsConfigService,
   SubmissionRestService,
-  SubmissionSectionsConfigService,
   SubmissionResponseParsingService,
   SubmissionJsonPatchOperationsService,
   JsonPatchOperationsBuilder,
-  AuthorityService,
-  IntegrationResponseParsingService,
-  MetadataschemaParsingService,
-  MetadatafieldParsingService,
   UploaderService,
   UUIDService,
   NotificationsService,
@@ -233,6 +235,7 @@ const PROVIDERS = [
   UploaderService,
   FileService,
   DSpaceObjectDataService,
+  ConfigurationDataService,
   DSOChangeAnalyzer,
   DefaultChangeAnalyzer,
   ArrayMoveChangeAnalyzer,
@@ -250,6 +253,7 @@ const PROVIDERS = [
   BitstreamDataService,
   EntityTypeService,
   ContentSourceResponseParsingService,
+  ItemTemplateDataService,
   SearchService,
   SidebarService,
   SearchFilterService,
@@ -264,15 +268,36 @@ const PROVIDERS = [
   LicenseDataService,
   ItemTypeDataService,
   WorkflowActionDataService,
+  ProcessDataService,
+  ScriptDataService,
+  FeatureDataService,
+  AuthorizationDataService,
+  SiteAdministratorGuard,
+  SiteRegisterGuard,
+  MetadataSchemaDataService,
+  MetadataFieldDataService,
+  TokenResponseParsingService,
+  ReloadGuard,
+  EndUserAgreementCurrentUserGuard,
+  EndUserAgreementCookieGuard,
+  EndUserAgreementService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: AuthInterceptor,
     multi: true
   },
+  // register LocaleInterceptor as HttpInterceptor
+  {
+    provide: HTTP_INTERCEPTORS,
+    useClass: LocaleInterceptor,
+    multi: true
+  },
   NotificationsService,
   FilteredDiscoveryPageResponseParsingService,
-  { provide: NativeWindowService, useFactory: NativeWindowFactory }
+  { provide: NativeWindowService, useFactory: NativeWindowFactory },
+  VocabularyService,
+  VocabularyTreeviewService
 ];
 
 /**
@@ -280,6 +305,7 @@ const PROVIDERS = [
  */
 export const models =
   [
+    Root,
     DSpaceObject,
     Bundle,
     Bitstream,
@@ -296,12 +322,13 @@ export const models =
     License,
     WorkflowItem,
     WorkspaceItem,
+    SubmissionCcLicence,
+    SubmissionCcLicenceUrl,
     SubmissionDefinitionsModel,
     SubmissionFormsModel,
     SubmissionSectionModel,
     SubmissionUploadsModel,
     AuthStatus,
-    AuthorityValue,
     BrowseEntry,
     BrowseDefinition,
     ClaimedTask,
@@ -312,9 +339,22 @@ export const models =
     ItemType,
     ExternalSource,
     ExternalSourceEntry,
+    Script,
+    Process,
     Version,
     VersionHistory,
-    WorkflowAction
+    WorkflowAction,
+    TemplateItem,
+    Feature,
+    Authorization,
+    Registration,
+    Vocabulary,
+    VocabularyEntry,
+    VocabularyEntryDetail,
+    ConfigurationProperty,
+    ShortLivedToken,
+    Registration,
+    UsageReport,
   ];
 
 @NgModule({
diff --git a/src/app/core/data/base-response-parsing.service.spec.ts b/src/app/core/data/base-response-parsing.service.spec.ts
index 85f531e0ea0..788986b3e43 100644
--- a/src/app/core/data/base-response-parsing.service.spec.ts
+++ b/src/app/core/data/base-response-parsing.service.spec.ts
@@ -18,7 +18,7 @@ class TestService extends BaseResponseParsingService {
   }
 
   public cache<ObjectDomain>(obj, request: RestRequest, data: any) {
-    super.cache(obj, request, data);
+    super.cache(obj, request, data, undefined);
   }
 }
 
@@ -62,7 +62,7 @@ describe('BaseResponseParsingService', () => {
 
       it('should call objectCache add', () => {
         service.cache(obj, request, {});
-        expect(objectCache.add).toHaveBeenCalledWith(obj, request.responseMsToLive, request.uuid);
+        expect(objectCache.add).toHaveBeenCalledWith(obj, request.responseMsToLive, request.uuid, undefined);
       });
     });
   });
diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index d69ebfbed5f..2f90013f4f2 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -1,14 +1,15 @@
 import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { Serializer } from '../serializer';
 import { PageInfo } from '../shared/page-info.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GenericConstructor } from '../shared/generic-constructor';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList, buildPaginatedList } from './paginated-list.model';
 import { getClassForType } from '../cache/builders/build-decorators';
 import { RestRequest } from './request.models';
 import { environment } from '../../../environments/environment';
+
 /* tslint:disable:max-classes-per-file */
 
 /**
@@ -28,10 +29,10 @@ export function isRestDataObject(halObj: any): boolean {
  */
 export function isRestPaginatedList(halObj: any): boolean {
   return hasValue(halObj.page) &&
-          hasValue(halObj.page.size) &&
-          hasValue(halObj.page.totalElements) &&
-          hasValue(halObj.page.totalPages) &&
-          hasValue(halObj.page.number);
+    hasValue(halObj.page.size) &&
+    hasValue(halObj.page.totalElements) &&
+    hasValue(halObj.page.totalPages) &&
+    hasValue(halObj.page.number);
 }
 
 export abstract class BaseResponseParsingService {
@@ -40,7 +41,7 @@ export abstract class BaseResponseParsingService {
   protected shouldDirectlyAttachEmbeds = false;
   protected serializerConstructor: GenericConstructor<Serializer<any>> = DSpaceSerializer;
 
-  protected process<ObjectDomain>(data: any, request: RestRequest): any {
+  protected process<ObjectDomain>(data: any, request: RestRequest, alternativeURL?: string): any {
     if (isNotEmpty(data)) {
       if (hasNoValue(data) || (typeof data !== 'object')) {
         return data;
@@ -55,21 +56,21 @@ export abstract class BaseResponseParsingService {
             .keys(data._embedded)
             .filter((property) => data._embedded.hasOwnProperty(property))
             .forEach((property) => {
-              const parsedObj = this.process<ObjectDomain>(data._embedded[property], request);
+              const parsedObj = this.process<ObjectDomain>(data._embedded[property], request, data._links[property].href);
               if (hasValue(object) && this.shouldDirectlyAttachEmbeds && isNotEmpty(parsedObj)) {
-                  if (isRestPaginatedList(data._embedded[property])) {
-                    object[property] = parsedObj;
-                    object[property].page = parsedObj.page.map((obj) => this.retrieveObjectOrUrl(obj));
-                  } else if (isRestDataObject(data._embedded[property])) {
-                    object[property] = this.retrieveObjectOrUrl(parsedObj);
-                  } else if (Array.isArray(parsedObj)) {
-                    object[property] = parsedObj.map((obj) => this.retrieveObjectOrUrl(obj))
-                  }
+                if (isRestPaginatedList(data._embedded[property])) {
+                  object[property] = parsedObj;
+                  object[property].page = parsedObj.page.map((obj) => this.retrieveObjectOrUrl(obj));
+                } else if (isRestDataObject(data._embedded[property])) {
+                  object[property] = this.retrieveObjectOrUrl(parsedObj);
+                } else if (Array.isArray(parsedObj)) {
+                  object[property] = parsedObj.map((obj) => this.retrieveObjectOrUrl(obj))
+                }
               }
             });
         }
 
-        this.cache(object, request, data);
+        this.cache(object, request, data, alternativeURL);
         return object;
       }
       const result = {};
@@ -95,7 +96,7 @@ export abstract class BaseResponseParsingService {
       list = this.flattenSingleKeyObject(list);
     }
     const page: ObjectDomain[] = this.processArray(list, request);
-    return new PaginatedList<ObjectDomain>(pageInfo, page, );
+    return buildPaginatedList<ObjectDomain>(pageInfo, page,);
   }
 
   protected processArray<ObjectDomain>(data: any, request: RestRequest): ObjectDomain[] {
@@ -126,13 +127,13 @@ export abstract class BaseResponseParsingService {
     }
   }
 
-  protected cache<ObjectDomain>(obj, request: RestRequest, data: any) {
+  protected cache<ObjectDomain>(obj, request: RestRequest, data: any, alternativeURL: string) {
     if (this.toCache) {
-      this.addToObjectCache(obj, request, data);
+      this.addToObjectCache(obj, request, data, alternativeURL);
     }
   }
 
-  protected addToObjectCache(co: CacheableObject, request: RestRequest, data: any): void {
+  protected addToObjectCache(co: CacheableObject, request: RestRequest, data: any, alternativeURL: string): void {
     if (hasNoValue(co) || hasNoValue(co._links) || hasNoValue(co._links.self) || hasNoValue(co._links.self.href)) {
       const type = hasValue(data) && hasValue(data.type) ? data.type : 'object';
       let dataJSON: string;
@@ -146,7 +147,8 @@ export abstract class BaseResponseParsingService {
       console.warn(`Can't cache incomplete ${type}: ${JSON.stringify(co)}, parsed from (partial) response: ${dataJSON}`);
       return;
     }
-    this.objectCache.add(co, hasValue(request.responseMsToLive) ? request.responseMsToLive : environment.cache.msToLive.default, request.uuid);
+
+    this.objectCache.add(co, hasValue(request.responseMsToLive) ? request.responseMsToLive : environment.cache.msToLive.default, request.uuid, alternativeURL);
   }
 
   processPageInfo(payload: any): PageInfo {
@@ -178,3 +180,4 @@ export abstract class BaseResponseParsingService {
     return statusCode >= 200 && statusCode < 300;
   }
 }
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index b328141d7b7..efe4f269ee1 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -10,6 +10,8 @@ import { BitstreamFormatSupportLevel } from '../shared/bitstream-format-support-
 import { PutRequest } from './request.models';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
@@ -17,6 +19,7 @@ describe('BitstreamDataService', () => {
   let requestService: RequestService;
   let halService: HALEndpointService;
   let bitstreamFormatService: BitstreamFormatDataService;
+  let rdbService: RemoteDataBuildService;
   const bitstreamFormatHref = 'rest-api/bitstreamformats';
 
   const bitstream = Object.assign(new Bitstream(), {
@@ -42,8 +45,9 @@ describe('BitstreamDataService', () => {
     bitstreamFormatService = jasmine.createSpyObj('bistreamFormatService', {
       getBrowseEndpoint: observableOf(bitstreamFormatHref)
     });
+    rdbService = getMockRemoteDataBuildService();
 
-    service = new BitstreamDataService(requestService, null, null, null, objectCache, halService, null, null, null, null, bitstreamFormatService);
+    service = new BitstreamDataService(requestService, rdbService, null, objectCache, halService, null, null, null, null, bitstreamFormatService);
   });
 
   describe('when updating the bitstream\'s format', () => {
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 4c24f5d78be..124f11480c6 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -16,20 +16,20 @@ import { Bundle } from '../shared/bundle.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { BundleDataService } from './bundle-data.service';
-import { CommunityDataService } from './community-data.service';
 import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList, buildPaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
-import { RemoteDataError } from './remote-data-error';
 import { FindListOptions, PutRequest } from './request.models';
 import { RequestService } from './request.service';
 import { BitstreamFormatDataService } from './bitstream-format-data.service';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
-import { RestResponse } from '../cache/response.models';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { configureRequest, getResponseFromEntry } from '../shared/operators';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { configureRequest } from '../shared/operators';
 import { combineLatest as observableCombineLatest } from 'rxjs';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { PageInfo } from '../shared/page-info.model';
+import { RequestEntryState } from './request.reducer';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
@@ -49,7 +49,6 @@ export class BitstreamDataService extends DataService<Bitstream> {
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected store: Store<CoreState>,
-    protected cds: CommunityDataService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
@@ -64,11 +63,15 @@ export class BitstreamDataService extends DataService<Bitstream> {
   /**
    * Retrieves the {@link Bitstream}s in a given bundle
    *
-   * @param bundle the bundle to retrieve bitstreams from
-   * @param options options for the find all request
+   * @param bundle            the bundle to retrieve bitstreams from
+   * @param options           options for the find all request
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  findAllByBundle(bundle: Bundle, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
-    return this.findAllByHref(bundle._links.bitstreams.href, options, ...linksToFollow);
+  findAllByBundle(bundle: Bundle, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
+    return this.findAllByHref(bundle._links.bitstreams.href, options, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -84,11 +87,13 @@ export class BitstreamDataService extends DataService<Bitstream> {
             map((bitstreamRD: RemoteData<PaginatedList<Bitstream>>) => {
               if (hasValue(bitstreamRD.payload) && hasValue(bitstreamRD.payload.page)) {
                 return new RemoteData(
-                  false,
-                  false,
-                  true,
-                  undefined,
-                  bitstreamRD.payload.page[0]
+                  bitstreamRD.timeCompleted,
+                  bitstreamRD.msToLive,
+                  bitstreamRD.lastUpdated,
+                  bitstreamRD.state,
+                  bitstreamRD.errorMessage,
+                  bitstreamRD.payload.page[0],
+                  bitstreamRD.statusCode
                 );
               } else {
                 return bitstreamRD as any;
@@ -124,19 +129,23 @@ export class BitstreamDataService extends DataService<Bitstream> {
                 );
                 if (hasValue(matchingThumbnail)) {
                   return new RemoteData(
-                    false,
-                    false,
-                    true,
-                    undefined,
-                    matchingThumbnail
+                    bitstreamRD.timeCompleted,
+                    bitstreamRD.msToLive,
+                    bitstreamRD.lastUpdated,
+                    bitstreamRD.state,
+                    bitstreamRD.errorMessage,
+                    matchingThumbnail,
+                    bitstreamRD.statusCode
                   );
                 } else {
                   return new RemoteData(
-                    false,
-                    false,
-                    false,
-                    new RemoteDataError(404, '404', 'No matching thumbnail found'),
-                    undefined
+                    bitstreamRD.timeCompleted,
+                    bitstreamRD.msToLive,
+                    bitstreamRD.lastUpdated,
+                    RequestEntryState.Error,
+                    'No matching thumbnail found',
+                    undefined,
+                    404
                   );
                 }
               } else {
@@ -157,16 +166,21 @@ export class BitstreamDataService extends DataService<Bitstream> {
    * The {@link Item} is technically redundant, but is available
    * in all current use cases, and having it simplifies this method
    *
-   * @param item the {@link Item} the {@link Bundle} is a part of
-   * @param bundleName the name of the {@link Bundle} we want to find {@link Bitstream}s for
+   * @param item              the {@link Item} the {@link Bundle} is a part of
+   * @param bundleName        the name of the {@link Bundle} we want to find {@link Bitstream}s for
    * @param options the {@link FindListOptions} for the request
-   * @param linksToFollow the {@link FollowLinkConfig}s for the request
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  public findAllByItemAndBundleName(item: Item, bundleName: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
+  public findAllByItemAndBundleName(item: Item, bundleName: string, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
     return this.bundleService.findByItemAndName(item, bundleName).pipe(
       switchMap((bundleRD: RemoteData<Bundle>) => {
-        if (hasValue(bundleRD.payload)) {
-          return this.findAllByBundle(bundleRD.payload, options, ...linksToFollow);
+        if (bundleRD.hasSucceeded && hasValue(bundleRD.payload)) {
+          return this.findAllByBundle(bundleRD.payload, options, reRequestOnStale, ...linksToFollow);
+        } else if (!bundleRD.hasSucceeded && bundleRD.statusCode === 404) {
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []), new Date().getTime())
         } else {
           return [bundleRD as any];
         }
@@ -179,7 +193,7 @@ export class BitstreamDataService extends DataService<Bitstream> {
    * @param bitstream
    * @param format
    */
-  updateFormat(bitstream: Bitstream, format: BitstreamFormat): Observable<RestResponse> {
+  updateFormat(bitstream: Bitstream, format: BitstreamFormat): Observable<RemoteData<Bitstream>> {
     const requestId = this.requestService.generateRequestId();
     const bitstreamHref$ = this.getBrowseEndpoint().pipe(
       map((href: string) => `${href}/${bitstream.id}`),
@@ -202,9 +216,7 @@ export class BitstreamDataService extends DataService<Bitstream> {
       this.requestService.removeByHrefSubstring(bitstream.self + '/format');
     });
 
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry()
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
 }
diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts
index 79544160106..1df0ad23fdc 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -18,6 +18,7 @@ import {
 } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { TestScheduler } from 'rxjs/testing';
 import { CoreState } from '../core.reducers';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 
 describe('BitstreamFormatDataService', () => {
   let service: BitstreamFormatDataService;
@@ -29,7 +30,6 @@ describe('BitstreamFormatDataService', () => {
 
   const responseCacheEntry = new RequestEntry();
   responseCacheEntry.response = new RestResponse(true, 200, 'Success');
-  responseCacheEntry.completed = true;
 
   const store = {
     dispatch(action: Action) {
@@ -47,9 +47,16 @@ describe('BitstreamFormatDataService', () => {
   const notificationsService = {} as NotificationsService;
   const http = {} as HttpClient;
   const comparator = {} as any;
-  const rdbService = {} as RemoteDataBuildService;
+
+  let rd;
+  let rdbService: RemoteDataBuildService;
 
   function initTestService(halService) {
+    rd = createSuccessfulRemoteDataObject({});
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildFromRequestUUID: observableOf(rd)
+    });
+
     return new BitstreamFormatDataService(
       requestService,
       rdbService,
@@ -141,7 +148,7 @@ describe('BitstreamFormatDataService', () => {
       const updatedBistreamFormat = new BitstreamFormat();
       updatedBistreamFormat.uuid = 'updated-uuid';
 
-      const expected = cold('(b)', {b: new RestResponse(true, 200, 'Success')});
+      const expected = cold('(b|)', {b: rd});
       const result = service.updateBitstreamFormat(updatedBistreamFormat);
 
       expect(result).toBeObservable(expected);
@@ -165,7 +172,7 @@ describe('BitstreamFormatDataService', () => {
       const newFormat = new BitstreamFormat();
       newFormat.uuid = 'new-uuid';
 
-      const expected = cold('(b)', {b: new RestResponse(true, 200, 'Success')});
+      const expected = cold('(b|)', {b: rd});
       const result = service.createBitstreamFormat(newFormat);
 
       expect(result).toBeObservable(expected);
@@ -281,7 +288,7 @@ describe('BitstreamFormatDataService', () => {
       format.uuid = 'format-uuid';
       format.id = 'format-id';
 
-      const expected = cold('(b|)', {b: true});
+      const expected = cold('(b|)', { b: rd });
       const result = service.delete(format.id);
 
       expect(result).toBeObservable(expected);
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index e8cf030a528..6e31322946d 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -3,31 +3,28 @@ import { Injectable } from '@angular/core';
 import { createSelector, select, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/internal/operators/distinctUntilChanged';
-import { find, map, tap } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 import {
   BitstreamFormatsRegistryDeselectAction,
   BitstreamFormatsRegistryDeselectAllAction,
   BitstreamFormatsRegistrySelectAction
 } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { BitstreamFormatRegistryState } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
-import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core.reducers';
 import { coreSelector } from '../core.selectors';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { BITSTREAM_FORMAT } from '../shared/bitstream-format.resource-type';
 import { Bitstream } from '../shared/bitstream.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { configureRequest, getResponseFromEntry } from '../shared/operators';
+import { configureRequest } from '../shared/operators';
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { RemoteData } from './remote-data';
-import { DeleteByIDRequest, PostRequest, PutRequest } from './request.models';
-import { RequestEntry } from './request.reducer';
+import { PostRequest, PutRequest } from './request.models';
 import { RequestService } from './request.service';
 
 const bitstreamFormatsStateSelector = createSelector(
@@ -79,7 +76,7 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
    * Update an existing bitstreamFormat
    * @param bitstreamFormat
    */
-  updateBitstreamFormat(bitstreamFormat: BitstreamFormat): Observable<RestResponse> {
+  updateBitstreamFormat(bitstreamFormat: BitstreamFormat): Observable<RemoteData<BitstreamFormat>> {
     const requestId = this.requestService.generateRequestId();
 
     this.getUpdateEndpoint(bitstreamFormat.id).pipe(
@@ -88,9 +85,7 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
         new PutRequest(requestId, endpointURL, bitstreamFormat)),
       configureRequest(this.requestService)).subscribe();
 
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry()
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
 
   }
 
@@ -98,7 +93,7 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
    * Create a new BitstreamFormat
    * @param {BitstreamFormat} bitstreamFormat
    */
-  public createBitstreamFormat(bitstreamFormat: BitstreamFormat): Observable<RestResponse> {
+  public createBitstreamFormat(bitstreamFormat: BitstreamFormat): Observable<RemoteData<BitstreamFormat>> {
     const requestId = this.requestService.generateRequestId();
 
     this.getCreateEndpoint().pipe(
@@ -108,9 +103,7 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
       configureRequest(this.requestService)
     ).subscribe();
 
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry()
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -152,31 +145,6 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
     this.store.dispatch(new BitstreamFormatsRegistryDeselectAllAction());
   }
 
-  /**
-   * Delete an existing DSpace Object on the server
-   * @param formatID The DSpace Object'id to be removed
-   * Return an observable that emits true when the deletion was successful, false when it failed
-   */
-  delete(formatID: string): Observable<boolean> {
-    const requestId = this.requestService.generateRequestId();
-
-    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, formatID)));
-
-    hrefObs.pipe(
-      find((href: string) => hasValue(href)),
-      map((href: string) => {
-        const request = new DeleteByIDRequest(requestId, href, formatID);
-        this.requestService.configure(request);
-      })
-    ).subscribe();
-
-    return this.requestService.getByUUID(requestId).pipe(
-      find((request: RequestEntry) => request.completed),
-      map((request: RequestEntry) => request.response.isSuccessful)
-    );
-  }
-
   findByBitstream(bitstream: Bitstream): Observable<RemoteData<BitstreamFormat>> {
     return this.findByHref(bitstream._links.format.href);
   }
diff --git a/src/app/core/data/browse-entries-response-parsing.service.spec.ts b/src/app/core/data/browse-entries-response-parsing.service.spec.ts
deleted file mode 100644
index 3c7319d5cf3..00000000000
--- a/src/app/core/data/browse-entries-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
-import { ErrorResponse, GenericSuccessResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { BrowseEntriesResponseParsingService } from './browse-entries-response-parsing.service';
-import { BrowseEntriesRequest } from './request.models';
-
-describe('BrowseEntriesResponseParsingService', () => {
-  let service: BrowseEntriesResponseParsingService;
-
-  beforeEach(() => {
-    service = new BrowseEntriesResponseParsingService(getMockObjectCacheService());
-  });
-
-  describe('parse', () => {
-    const request = new BrowseEntriesRequest('client/f5b4ccb8-fbb0-4548-b558-f234d9fdfad6', 'https://rest.api/discover/browses/author/entries');
-
-    const validResponse = {
-      payload: {
-        _embedded: {
-          browseEntries: [
-            {
-              authority: null,
-              value: 'Arulmozhiyal, Ramaswamy',
-              valueLang: null,
-              count: 1,
-              type: 'browseEntry',
-              _links: {
-                items: {
-                  href: 'https://rest.api/discover/browses/author/items?filterValue=Arulmozhiyal, Ramaswamy'
-                }
-              }
-            },
-            {
-              authority: null,
-              value: 'Bastida-Jumilla, Ma Consuelo',
-              valueLang: null,
-              count: 1,
-              type: 'browseEntry',
-              _links: {
-                items: {
-                  href: 'https://rest.api/discover/browses/author/items?filterValue=Bastida-Jumilla, Ma Consuelo'
-                }
-              }
-            },
-            {
-              authority: null,
-              value: 'Cao, Binggang',
-              valueLang: null,
-              count: 1,
-              type: 'browseEntry',
-              _links: {
-                items: {
-                  href: 'https://rest.api/discover/browses/author/items?filterValue=Cao, Binggang'
-                }
-              }
-            },
-            {
-              authority: null,
-              value: 'Castelli, Mauro',
-              valueLang: null,
-              count: 1,
-              type: 'browseEntry',
-              _links: {
-                items: {
-                  href: 'https://rest.api/discover/browses/author/items?filterValue=Castelli, Mauro'
-                }
-              }
-            },
-            {
-              authority: null,
-              value: 'Cat, Lily',
-              valueLang: null,
-              count: 1,
-              type: 'browseEntry',
-              _links: {
-                items: {
-                  href: 'https://rest.api/discover/browses/author/items?filterValue=Cat, Lily'
-                }
-              }
-            }
-          ]
-        },
-        _links: {
-          first: {
-            href: 'https://rest.api/discover/browses/author/entries?page=0&size=5'
-          },
-          self: {
-            href: 'https://rest.api/discover/browses/author/entries'
-          },
-          next: {
-            href: 'https://rest.api/discover/browses/author/entries?page=1&size=5'
-          },
-          last: {
-            href: 'https://rest.api/discover/browses/author/entries?page=9&size=5'
-          }
-        },
-        page: {
-          size: 5,
-          totalElements: 50,
-          totalPages: 10,
-          number: 0
-        }
-      },
-      statusCode: 200,
-      statusText: 'OK'
-    } as DSpaceRESTV2Response;
-
-    const invalidResponseNotAList = {
-      statusCode: 200,
-      statusText: 'OK'
-    } as DSpaceRESTV2Response;
-
-    const invalidResponseStatusCode = {
-      payload: {}, statusCode: 500, statusText: 'Internal Server Error'
-    } as DSpaceRESTV2Response;
-
-    it('should return a GenericSuccessResponse if data contains a valid browse entries response', () => {
-      const response = service.parse(request, validResponse);
-      expect(response.constructor).toBe(GenericSuccessResponse);
-    });
-
-    it('should return an ErrorResponse if data contains an invalid browse entries response', () => {
-      const response = service.parse(request, invalidResponseNotAList);
-      expect(response.constructor).toBe(ErrorResponse);
-    });
-
-    it('should return an ErrorResponse if data contains a statuscode other than 200', () => {
-      const response = service.parse(request, invalidResponseStatusCode);
-      expect(response.constructor).toBe(ErrorResponse);
-    });
-
-  });
-});
diff --git a/src/app/core/data/browse-entries-response-parsing.service.ts b/src/app/core/data/browse-entries-response-parsing.service.ts
deleted file mode 100644
index 98385f02375..00000000000
--- a/src/app/core/data/browse-entries-response-parsing.service.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Inject, Injectable } from '@angular/core';
-import { isNotEmpty } from '../../shared/empty.util';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { ErrorResponse, GenericSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { BrowseEntry } from '../shared/browse-entry.model';
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class BrowseEntriesResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-
-  protected toCache = false;
-
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) { super();
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload)) {
-      let browseEntries = [];
-      if (isNotEmpty(data.payload._embedded) && Array.isArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]])) {
-        const serializer = new DSpaceSerializer(BrowseEntry);
-        browseEntries = serializer.deserializeArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]]);
-      }
-      return new GenericSuccessResponse(browseEntries, data.statusCode, data.statusText, this.processPageInfo(data.payload));
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from browse endpoint'),
-          { statusCode: data.statusCode, statusText: data.statusText }
-        )
-      );
-    }
-  }
-
-}
diff --git a/src/app/core/data/browse-items-response-parsing-service.spec.ts b/src/app/core/data/browse-items-response-parsing-service.spec.ts
deleted file mode 100644
index a1b1a14bff2..00000000000
--- a/src/app/core/data/browse-items-response-parsing-service.spec.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
-import { ErrorResponse, GenericSuccessResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { BrowseEntriesResponseParsingService } from './browse-entries-response-parsing.service';
-import { BrowseEntriesRequest, BrowseItemsRequest } from './request.models';
-import { BrowseItemsResponseParsingService } from './browse-items-response-parsing-service';
-
-describe('BrowseItemsResponseParsingService', () => {
-  let service: BrowseItemsResponseParsingService;
-
-  beforeEach(() => {
-    service = new BrowseItemsResponseParsingService(getMockObjectCacheService());
-  });
-
-  describe('parse', () => {
-    const request = new BrowseItemsRequest('client/f5b4ccb8-fbb0-4548-b558-f234d9fdfad6', 'https://rest.api/discover/browses/author/items');
-
-    const validResponse = {
-      payload: {
-        _embedded: {
-          items: [
-            {
-              id: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
-              uuid: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
-              name: 'Development of Local Supply Chain : A Critical Link for Concentrated Solar Power in India',
-              handle: '10986/17472',
-              metadata: {
-                'dc.creator': [
-                  {
-                    value: 'World Bank',
-                    language: null
-                  }
-                ]
-              },
-              inArchive: true,
-              discoverable: true,
-              withdrawn: false,
-              lastModified: '2018-05-25T09:32:58.005+0000',
-              type: 'item',
-              _links: {
-                bitstreams: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7/bitstreams'
-                },
-                owningCollection: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7/owningCollection'
-                },
-                templateItemOf: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7/templateItemOf'
-                },
-                self: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7'
-                }
-              }
-            },
-            {
-              id: '27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b',
-              uuid: '27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b',
-              name: 'Development of Local Supply Chain : The Missing Link for Concentrated Solar Power Projects in India',
-              handle: '10986/17475',
-              metadata: {
-                'dc.creator': [
-                  {
-                    value: 'World Bank',
-                    language: null
-                  }
-                ]
-              },
-              inArchive: true,
-              discoverable: true,
-              withdrawn: false,
-              lastModified: '2018-05-25T09:33:42.526+0000',
-              type: 'item',
-              _links: {
-                bitstreams: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b/bitstreams'
-                },
-                owningCollection: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b/owningCollection'
-                },
-                templateItemOf: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b/templateItemOf'
-                },
-                self: {
-                  href: 'https://dspace7-internal.atmire.com/rest/api/core/items/27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b'
-                }
-              }
-            }
-          ]
-        },
-        _links: {
-          first: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/discover/browses/author/items?page=0&size=2'
-          },
-          self: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/discover/browses/author/items'
-          },
-          next: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/discover/browses/author/items?page=1&size=2'
-          },
-          last: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/discover/browses/author/items?page=7&size=2'
-          }
-        },
-        page: {
-          size: 2,
-          totalElements: 16,
-          totalPages: 8,
-          number: 0
-        }
-      },
-      statusCode: 200,
-      statusText: 'OK'
-    } as DSpaceRESTV2Response;
-
-    const invalidResponseNotAList = {
-      payload: {
-        id: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
-        uuid: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
-        name: 'Development of Local Supply Chain : A Critical Link for Concentrated Solar Power in India',
-        handle: '10986/17472',
-        metadata: {
-          'dc.creator': [
-            {
-              value: 'World Bank',
-              language: null
-            }
-          ]
-        },
-        inArchive: true,
-        discoverable: true,
-        withdrawn: false,
-        lastModified: '2018-05-25T09:32:58.005+0000',
-        type: 'item',
-        _links: {
-          bitstreams: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7/bitstreams'
-          },
-          owningCollection: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7/owningCollection'
-          },
-          templateItemOf: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7/templateItemOf'
-          },
-          self: {
-            href: 'https://dspace7-internal.atmire.com/rest/api/core/items/d7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7'
-          }
-        }
-      },
-      statusCode: 200,
-      statusText: 'OK'
-    } as DSpaceRESTV2Response;
-
-    const invalidResponseStatusCode = {
-      payload: {}, statusCode: 500, statusText: 'Internal Server Error'
-    } as DSpaceRESTV2Response;
-
-    it('should return a GenericSuccessResponse if data contains a valid browse items response', () => {
-      const response = service.parse(request, validResponse);
-      expect(response.constructor).toBe(GenericSuccessResponse);
-    });
-
-    it('should return an ErrorResponse if data contains an invalid browse entries response', () => {
-      const response = service.parse(request, invalidResponseNotAList);
-      expect(response.constructor).toBe(ErrorResponse);
-    });
-
-    it('should return an ErrorResponse if data contains a statuscode other than 200', () => {
-      const response = service.parse(request, invalidResponseStatusCode);
-      expect(response.constructor).toBe(ErrorResponse);
-    });
-
-  });
-});
diff --git a/src/app/core/data/browse-items-response-parsing-service.ts b/src/app/core/data/browse-items-response-parsing-service.ts
deleted file mode 100644
index 2b7ec647c9a..00000000000
--- a/src/app/core/data/browse-items-response-parsing-service.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { ErrorResponse, GenericSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-/**
- * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to Browse Items (DSpaceObject[])
- */
-@Injectable()
-export class BrowseItemsResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-  protected toCache = false;
-
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) { super();
-  }
-
-  /**
-   * Parses data from the browse endpoint to a list of DSpaceObjects
-   * @param {RestRequest} request
-   * @param {DSpaceRESTV2Response} data
-   * @returns {RestResponse}
-   */
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._embedded)
-      && Array.isArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]])) {
-      const serializer = new DSpaceSerializer(DSpaceObject);
-      const items = serializer.deserializeArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]]);
-      return new GenericSuccessResponse(items, data.statusCode, data.statusText, this.processPageInfo(data.payload));
-    } else if (hasValue(data.payload) && hasValue(data.payload.page)) {
-      return new GenericSuccessResponse([], data.statusCode, data.statusText, this.processPageInfo(data.payload));
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from browse endpoint'),
-          { statusCode: data.statusCode, statusText: data.statusText }
-        )
-      );
-    }
-  }
-
-}
diff --git a/src/app/core/data/browse-response-parsing.service.spec.ts b/src/app/core/data/browse-response-parsing.service.spec.ts
deleted file mode 100644
index fedfea13090..00000000000
--- a/src/app/core/data/browse-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { ErrorResponse, GenericSuccessResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { BrowseDefinition } from '../shared/browse-definition.model';
-import { BrowseResponseParsingService } from './browse-response-parsing.service';
-import { BrowseEndpointRequest } from './request.models';
-
-describe('BrowseResponseParsingService', () => {
-  let service: BrowseResponseParsingService;
-
-  beforeEach(() => {
-    service = new BrowseResponseParsingService();
-  });
-  let validRequest;
-  let validResponse;
-  let invalidResponse1;
-  let invalidResponse2;
-  let invalidResponse3;
-  let definitions;
-
-  describe('parse', () => {
-    beforeEach(() => {
-      validRequest = new BrowseEndpointRequest('client/b186e8ce-e99c-4183-bc9a-42b4821bdb78', 'https://rest.api/discover/browses');
-
-      validResponse = {
-        payload: {
-          _embedded: {
-            browses: [{
-              metadataBrowse: false,
-              sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
-                name: 'dateissued',
-                metadata: 'dc.date.issued'
-              }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
-              order: 'ASC',
-              metadata: ['dc.date.issued'],
-              _links: {
-                self: { href: 'https://rest.api/discover/browses/dateissued' },
-                items: { href: 'https://rest.api/discover/browses/dateissued/items' }
-              }
-            }, {
-              metadataBrowse: true,
-              sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
-                name: 'dateissued',
-                metadata: 'dc.date.issued'
-              }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
-              order: 'ASC',
-              metadata: ['dc.contributor.*', 'dc.creator'],
-              _links: {
-                self: { href: 'https://rest.api/discover/browses/author' },
-                entries: { href: 'https://rest.api/discover/browses/author/entries' },
-                items: { href: 'https://rest.api/discover/browses/author/items' }
-              }
-            }]
-          },
-          _links: { self: { href: 'https://rest.api/discover/browses' } },
-          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-        }, statusCode: 200, statusText: 'OK'
-      } as DSpaceRESTV2Response;
-
-      invalidResponse1 = {
-        payload: {
-          _embedded: {
-            browse: {
-              metadataBrowse: false,
-              sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
-                name: 'dateissued',
-                metadata: 'dc.date.issued'
-              }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
-              order: 'ASC',
-              metadata: ['dc.date.issued'],
-              _links: {
-                self: { href: 'https://rest.api/discover/browses/dateissued' },
-                items: { href: 'https://rest.api/discover/browses/dateissued/items' }
-              }
-            }
-          },
-          _links: { self: { href: 'https://rest.api/discover/browses' } },
-          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-        }, statusCode: 200, statusText: 'OK'
-      } as DSpaceRESTV2Response;
-
-      invalidResponse2 = {
-        payload: {
-          _links: { self: { href: 'https://rest.api/discover/browses' } },
-          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-        }, statusCode: 200, statusText: 'OK'
-      } as DSpaceRESTV2Response;
-
-      invalidResponse3 = {
-        payload: {
-          _links: { self: { href: 'https://rest.api/discover/browses' } },
-          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-        }, statusCode: 500, statusText: 'Internal Server Error'
-      } as DSpaceRESTV2Response;
-
-      definitions = [
-        Object.assign(new BrowseDefinition(), {
-          metadataBrowse: false,
-          sortOptions: [
-            {
-              name: 'title',
-              metadata: 'dc.title'
-            },
-            {
-              name: 'dateissued',
-              metadata: 'dc.date.issued'
-            },
-            {
-              name: 'dateaccessioned',
-              metadata: 'dc.date.accessioned'
-            }
-          ],
-          defaultSortOrder: 'ASC',
-          metadataKeys: [
-            'dc.date.issued'
-          ],
-          _links: {
-            self: { href: 'https://rest.api/discover/browses/dateissued' },
-            items: { href: 'https://rest.api/discover/browses/dateissued/items' }
-          }
-        }),
-        Object.assign(new BrowseDefinition(), {
-          metadataBrowse: true,
-          sortOptions: [
-            {
-              name: 'title',
-              metadata: 'dc.title'
-            },
-            {
-              name: 'dateissued',
-              metadata: 'dc.date.issued'
-            },
-            {
-              name: 'dateaccessioned',
-              metadata: 'dc.date.accessioned'
-            }
-          ],
-          defaultSortOrder: 'ASC',
-          metadataKeys: [
-            'dc.contributor.*',
-            'dc.creator'
-          ],
-          _links: {
-            self: { href: 'https://rest.api/discover/browses/author' },
-            entries: { href: 'https://rest.api/discover/browses/author/entries' },
-            items: { href: 'https://rest.api/discover/browses/author/items' }
-          }
-        })
-      ];
-    });
-    it('should return a GenericSuccessResponse if data contains a valid browse endpoint response', () => {
-      const response = service.parse(validRequest, validResponse);
-      expect(response.constructor).toBe(GenericSuccessResponse);
-    });
-
-    it('should return an ErrorResponse if data contains an invalid browse endpoint response', () => {
-      const response1 = service.parse(validRequest, invalidResponse1);
-      const response2 = service.parse(validRequest, invalidResponse2);
-      expect(response1.constructor).toBe(ErrorResponse);
-      expect(response2.constructor).toBe(ErrorResponse);
-    });
-
-    it('should return an ErrorResponse if data contains a statuscode other than 200', () => {
-      const response = service.parse(validRequest, invalidResponse3);
-      expect(response.constructor).toBe(ErrorResponse);
-    });
-
-    it('should return a GenericSuccessResponse with the BrowseDefinitions in data', () => {
-      const response = service.parse(validRequest, validResponse);
-      expect((response as GenericSuccessResponse<BrowseDefinition[]>).payload).toEqual(definitions);
-    });
-  });
-});
diff --git a/src/app/core/data/browse-response-parsing.service.ts b/src/app/core/data/browse-response-parsing.service.ts
deleted file mode 100644
index d1b9c2f15c6..00000000000
--- a/src/app/core/data/browse-response-parsing.service.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Injectable } from '@angular/core';
-import { isNotEmpty } from '../../shared/empty.util';
-import { ErrorResponse, GenericSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { BrowseDefinition } from '../shared/browse-definition.model';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class BrowseResponseParsingService implements ResponseParsingService {
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._embedded)
-      && Array.isArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]])) {
-      const serializer = new DSpaceSerializer(BrowseDefinition);
-      const browseDefinitions = serializer.deserializeArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]]);
-      return new GenericSuccessResponse(browseDefinitions, data.statusCode, data.statusText);
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from browse endpoint'),
-          { statusCode: data.statusCode, statusText: data.statusText }
-        )
-      );
-    }
-  }
-}
diff --git a/src/app/core/data/bundle-data.service.spec.ts b/src/app/core/data/bundle-data.service.spec.ts
new file mode 100644
index 00000000000..8c14ca0a97d
--- /dev/null
+++ b/src/app/core/data/bundle-data.service.spec.ts
@@ -0,0 +1,134 @@
+import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import { compare, Operation } from 'fast-json-patch';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CoreState } from '../core.reducers';
+import { Item } from '../shared/item.model';
+import { ChangeAnalyzer } from './change-analyzer';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { BundleDataService } from './bundle-data.service';
+import { HALLink } from '../shared/hal-link.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { Bundle } from '../shared/bundle.model';
+
+class DummyChangeAnalyzer implements ChangeAnalyzer<Item> {
+  diff(object1: Item, object2: Item): Operation[] {
+    return compare((object1 as any).metadata, (object2 as any).metadata);
+  }
+}
+
+describe('BundleDataService', () => {
+  let service: BundleDataService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let notificationsService;
+  let http;
+  let comparator;
+  let objectCache;
+  let store;
+  let item;
+  let bundleLink;
+  let bundleHALLink;
+
+  function initTestService(): BundleDataService {
+    bundleLink = '/items/0fdc0cd7-ff8c-433d-b33c-9b56108abc07/bundles';
+    bundleHALLink = new HALLink();
+    bundleHALLink.href = bundleLink;
+    item = new Item();
+    item._links = {
+      bundles: bundleHALLink
+    };
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = {} as RemoteDataBuildService;
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = new DummyChangeAnalyzer() as any;
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      }
+    } as any;
+    store = {} as Store<CoreState>;
+    return new BundleDataService(
+      requestService,
+      rdbService,
+      store,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator,
+    );
+  }
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+  describe('findAllByItem', () => {
+    beforeEach(() => {
+      spyOn(service, 'findAllByHref');
+      service.findAllByItem(item);
+    });
+
+    it('should call findAllByHref with the item\'s bundles link', () => {
+      expect(service.findAllByHref).toHaveBeenCalledWith(bundleLink, undefined, true);
+    })
+  });
+
+  describe('findByItemAndName', () => {
+    let bundles: Bundle[];
+
+    beforeEach(() => {
+      bundles = [
+        Object.assign(new Bundle(), {
+          id: 'ORIGINAL_BUNDLE',
+          metadata: {
+            'dc.title': [
+              {
+                value: 'ORIGINAL'
+              }
+            ]
+          }
+        }),
+        Object.assign(new Bundle(), {
+          id: 'THUMBNAIL_BUNDLE',
+          metadata: {
+            'dc.title': [
+              {
+                value: 'THUMBNAIL'
+              }
+            ]
+          }
+        }),
+        Object.assign(new Bundle(), {
+          id: 'EXTRA_BUNDLE',
+          metadata: {
+            'dc.title': [
+              {
+                value: 'EXTRA'
+              }
+            ]
+          }
+        }),
+      ];
+      spyOn(service, 'findAllByItem').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(bundles)));
+    });
+
+    it('should only return the requested bundle by name', (done) => {
+      service.findByItemAndName(undefined, 'THUMBNAIL').subscribe((result) => {
+        expect(result.payload.id).toEqual('THUMBNAIL_BUNDLE');
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 160ea0ff0df..88f060c3cdb 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -16,12 +16,13 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { FindListOptions, GetRequest } from './request.models';
 import { RequestService } from './request.service';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 import { Bitstream } from '../shared/bitstream.model';
+import { RequestEntryState } from './request.reducer';
 
 /**
  * A service to retrieve {@link Bundle}s from the REST API
@@ -49,35 +50,53 @@ export class BundleDataService extends DataService<Bundle> {
   /**
    * Retrieve all {@link Bundle}s in the given {@link Item}
    *
-   * @param item the {@link Item} the {@link Bundle}s are a part of
-   * @param options the {@link FindListOptions} for the request
-   * @param linksToFollow the {@link FollowLinkConfig}s for the request
+   * @param item              the {@link Item} the {@link Bundle}s are a part of
+   * @param options           the {@link FindListOptions} for the request
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     the {@link FollowLinkConfig}s for the request
    */
-  findAllByItem(item: Item, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<Bundle>>): Observable<RemoteData<PaginatedList<Bundle>>> {
-    return this.findAllByHref(item._links.bundles.href, options,  ...linksToFollow);
+  findAllByItem(item: Item, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Bundle>>): Observable<RemoteData<PaginatedList<Bundle>>> {
+    return this.findAllByHref(item._links.bundles.href, options, reRequestOnStale, ...linksToFollow);
   }
 
   /**
    * Retrieve a {@link Bundle} in the given {@link Item} by name
    *
-   * @param item the {@link Item} the {@link Bundle}s are a part of
-   * @param bundleName the name of the {@link Bundle} to retrieve
-   * @param linksToFollow the {@link FollowLinkConfig}s for the request
+   * @param item              the {@link Item} the {@link Bundle}s are a part of
+   * @param bundleName        the name of the {@link Bundle} to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     the {@link FollowLinkConfig}s for the request
    */
   // TODO should be implemented rest side
-  findByItemAndName(item: Item, bundleName: string, ...linksToFollow: Array<FollowLinkConfig<Bundle>>): Observable<RemoteData<Bundle>> {
-    return this.findAllByItem(item, { elementsPerPage: Number.MAX_SAFE_INTEGER }, ...linksToFollow).pipe(
+  findByItemAndName(item: Item, bundleName: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Bundle>>): Observable<RemoteData<Bundle>> {
+    return this.findAllByItem(item, { elementsPerPage: Number.MAX_SAFE_INTEGER }, reRequestOnStale, ...linksToFollow).pipe(
       map((rd: RemoteData<PaginatedList<Bundle>>) => {
         if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
           const matchingBundle = rd.payload.page.find((bundle: Bundle) =>
             bundle.name === bundleName);
-          return new RemoteData(
-            false,
-            false,
-            true,
-            undefined,
-            matchingBundle
-          );
+          if (hasValue(matchingBundle)) {
+            return new RemoteData(
+              rd.timeCompleted,
+              rd.msToLive,
+              rd.lastUpdated,
+              RequestEntryState.Success,
+              null,
+              matchingBundle,
+              200
+            );
+          } else {
+            return new RemoteData(
+              rd.timeCompleted,
+              rd.msToLive,
+              rd.lastUpdated,
+              RequestEntryState.Error,
+              `The bundle with name ${bundleName} was not found.`,
+              null,
+              404
+            );
+          }
         } else {
           return rd as any;
         }
@@ -88,10 +107,12 @@ export class BundleDataService extends DataService<Bundle> {
   /**
    * Get the bitstreams endpoint for a bundle
    * @param bundleId
+   * @param searchOptions
    */
-  getBitstreamsEndpoint(bundleId: string): Observable<string> {
+  getBitstreamsEndpoint(bundleId: string, searchOptions?: PaginatedSearchOptions): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      switchMap((href: string) => this.halService.getEndpoint(this.bitstreamsEndpoint, `${href}/${bundleId}`))
+      switchMap((href: string) => this.halService.getEndpoint(this.bitstreamsEndpoint, `${href}/${bundleId}`)),
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
     );
   }
 
@@ -102,9 +123,8 @@ export class BundleDataService extends DataService<Bundle> {
    * @param linksToFollow   The {@link FollowLinkConfig}s for the request
    */
   getBitstreams(bundleId: string, searchOptions?: PaginatedSearchOptions, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
-    const hrefObs = this.getBitstreamsEndpoint(bundleId).pipe(
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
-    );
+    const hrefObs = this.getBitstreamsEndpoint(bundleId, searchOptions);
+
     hrefObs.pipe(
       take(1)
     ).subscribe((href) => {
diff --git a/src/app/core/data/change-analyzer.ts b/src/app/core/data/change-analyzer.ts
index 395af4a68c5..df36edd281b 100644
--- a/src/app/core/data/change-analyzer.ts
+++ b/src/app/core/data/change-analyzer.ts
@@ -1,11 +1,11 @@
 import { Operation } from 'fast-json-patch/lib/core';
-import { CacheableObject } from '../cache/object-cache.reducer';
+import { TypedObject } from '../cache/object-cache.reducer';
 
 /**
  * An interface to determine what differs between two
  * NormalizedObjects
  */
-export interface ChangeAnalyzer<T extends CacheableObject> {
+export interface ChangeAnalyzer<T extends TypedObject> {
 
   /**
    * Compare two objects and return their differences as a
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index eb3dabf195a..530f3c1580d 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -6,20 +6,30 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { fakeAsync, tick } from '@angular/core/testing';
-import { ContentSourceRequest, GetRequest, RequestError, UpdateContentSourceRequest } from './request.models';
+import { ContentSourceRequest, GetRequest, UpdateContentSourceRequest } from './request.models';
 import { ContentSource } from '../shared/content-source.model';
-import { of as observableOf } from 'rxjs/internal/observable/of';
-import { RequestEntry } from './request.reducer';
-import { ErrorResponse, RestResponse } from '../cache/response.models';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Collection } from '../shared/collection.model';
+import { PageInfo } from '../shared/page-info.model';
+import { buildPaginatedList } from './paginated-list.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from 'src/app/shared/remote-data.utils';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from './remote-data';
+import { hasNoValue } from '../../shared/empty.util';
 
 const url = 'fake-url';
 const collectionId = 'fake-collection-id';
 
 describe('CollectionDataService', () => {
   let service: CollectionDataService;
-
+  let scheduler: TestScheduler;
   let requestService: RequestService;
   let translate: TranslateService;
   let notificationsService: any;
@@ -27,6 +37,44 @@ describe('CollectionDataService', () => {
   let objectCache: ObjectCacheService;
   let halService: any;
 
+  const mockCollection1: Collection = Object.assign(new Collection(), {
+    id: 'test-collection-1-1',
+    name: 'test-collection-1',
+    _links: {
+      self: {
+        href: 'https://rest.api/collections/test-collection-1-1'
+      }
+    }
+  });
+
+  const mockCollection2: Collection = Object.assign(new Collection(), {
+    id: 'test-collection-2-2',
+    name: 'test-collection-2',
+    _links: {
+      self: {
+        href: 'https://rest.api/collections/test-collection-2-2'
+      }
+    }
+  });
+
+  const mockCollection3: Collection = Object.assign(new Collection(), {
+    id: 'test-collection-3-3',
+    name: 'test-collection-3',
+    _links: {
+      self: {
+        href: 'https://rest.api/collections/test-collection-3-3'
+      }
+    }
+  });
+
+  const queryString = 'test-string';
+  const communityId = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const pageInfo = new PageInfo();
+  const array = [mockCollection1, mockCollection2, mockCollection3];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
   describe('when the requests are successful', () => {
     beforeEach(() => {
       createService();
@@ -74,17 +122,48 @@ describe('CollectionDataService', () => {
       });
     });
 
+    describe('when calling getAuthorizedCollection', () => {
+      beforeEach(() => {
+        scheduler = getTestScheduler();
+        spyOn(service, 'getAuthorizedCollection').and.callThrough();
+        spyOn(service, 'getAuthorizedCollectionByCommunity').and.callThrough();
+      });
+
+      it('should proxy the call to getAuthorizedCollection', () => {
+        scheduler.schedule(() => service.getAuthorizedCollection(queryString));
+        scheduler.flush();
+
+        expect(service.getAuthorizedCollection).toHaveBeenCalledWith(queryString);
+      });
+
+      it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollection', () => {
+        const result = service.getAuthorizedCollection(queryString);
+        const expected = cold('a|', {
+          a: paginatedListRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+
+      it('should proxy the call to getAuthorizedCollectionByCommunity', () => {
+        scheduler.schedule(() => service.getAuthorizedCollectionByCommunity(communityId, queryString));
+        scheduler.flush();
+
+        expect(service.getAuthorizedCollectionByCommunity).toHaveBeenCalledWith(communityId, queryString);
+      });
+
+      it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollectionByCommunity', () => {
+        const result = service.getAuthorizedCollectionByCommunity(communityId, queryString);
+        const expected = cold('a|', {
+          a: paginatedListRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
   });
 
   describe('when the requests are unsuccessful', () => {
     beforeEach(() => {
-      createService(observableOf(Object.assign(new RequestEntry(), {
-        response: new ErrorResponse(Object.assign({
-          statusCode: 422,
-          statusText: 'Unprocessable Entity',
-          message: 'Error message'
-        }))
-      })));
+      createService(createFailedRemoteDataObject$('Error', 500));
     });
 
     describe('when calling updateContentSource', () => {
@@ -112,12 +191,20 @@ describe('CollectionDataService', () => {
 
   /**
    * Create a CollectionDataService used for testing
-   * @param requestEntry$   Supply a requestEntry to be returned by the REST API (optional)
+   * @param reponse$   Supply a RemoteData to be returned by the REST API (optional)
    */
-  function createService(requestEntry$?) {
-    requestService = getMockRequestService(requestEntry$);
+  function createService(reponse$?: Observable<RemoteData<any>>) {
+    requestService = getMockRequestService();
+    let buildResponse$ = reponse$;
+    if (hasNoValue(reponse$)) {
+      buildResponse$ = createSuccessfulRemoteDataObject$({});
+    }
     rdbService = jasmine.createSpyObj('rdbService', {
-      buildList: jasmine.createSpy('buildList')
+      buildList: hot('a|', {
+        a: paginatedListRD
+      }),
+      buildFromRequestUUID: buildResponse$,
+      buildSingle: buildResponse$
     });
     objectCache = jasmine.createSpyObj('objectCache', {
       remove: jasmine.createSpy('remove')
@@ -126,7 +213,7 @@ describe('CollectionDataService', () => {
     notificationsService = new NotificationsServiceStub();
     translate = getMockTranslateService();
 
-    service = new CollectionDataService(requestService, rdbService, null, null, objectCache, halService, notificationsService, null, null, translate);
+    service = new CollectionDataService(requestService, rdbService, null, null, objectCache, halService, notificationsService, null, null,null, translate);
   }
 
 });
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 6ae40f4ca9b..cfc7962d4e1 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -12,12 +12,11 @@ import { PaginatedSearchOptions } from '../../shared/search/paginated-search-opt
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { ContentSourceSuccessResponse, RestResponse } from '../cache/response.models';
 import { CoreState } from '../core.reducers';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { Collection } from '../shared/collection.model';
 import { COLLECTION } from '../shared/collection.resource-type';
 import { ContentSource } from '../shared/content-source.model';
@@ -27,25 +26,23 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import {
   configureRequest,
-  filterSuccessfulResponses,
-  getRequestFromRequestHref,
-  getResponseFromEntry
+  getFirstCompletedRemoteData
 } from '../shared/operators';
 import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { ResponseParsingService } from './parsing.service';
 import { RemoteData } from './remote-data';
 import {
   ContentSourceRequest,
   FindListOptions,
   GetRequest,
-  RestRequest,
   UpdateContentSourceRequest
 } from './request.models';
 import { RequestService } from './request.service';
+import { BitstreamDataService } from './bitstream-data.service';
 
 @Injectable()
 @dataService(COLLECTION)
@@ -63,6 +60,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
     protected http: HttpClient,
+    protected bitstreamDataService: BitstreamDataService,
     protected comparator: DSOChangeAnalyzer<Collection>,
     protected translate: TranslateService
   ) {
@@ -72,14 +70,20 @@ export class CollectionDataService extends ComColDataService<Collection> {
   /**
    * Get all collections the user is authorized to submit to
    *
+   * @param query limit the returned collection to those with metadata values matching the query terms.
    * @param options The [[FindListOptions]] object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollection(options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
-    const searchHref = 'findAuthorized';
+  getAuthorizedCollection(query: string, options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Collection>>): Observable<RemoteData<PaginatedList<Collection>>> {
+    const searchHref = 'findSubmitAuthorized';
+    options = Object.assign({}, options, {
+      searchParams: [new RequestParam('query', query)]
+    });
 
-    return this.searchBy(searchHref, options).pipe(
+    return this.searchBy(searchHref, options, reRequestOnStale, ...linksToFollow).pipe(
       filter((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending));
   }
 
@@ -87,14 +91,18 @@ export class CollectionDataService extends ComColDataService<Collection> {
    * Get all collections the user is authorized to submit to, by community
    *
    * @param communityId The community id
+   * @param query limit the returned collection to those with metadata values matching the query terms.
    * @param options The [[FindListOptions]] object
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollectionByCommunity(communityId: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
-    const searchHref = 'findAuthorizedByCommunity';
+  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
+    const searchHref = 'findSubmitAuthorizedByCommunity';
     options = Object.assign({}, options, {
-      searchParams: [new SearchParam('uuid', communityId)]
+      searchParams: [
+        new RequestParam('uuid', communityId),
+        new RequestParam('query', query)
+      ]
     });
 
     return this.searchBy(searchHref, options).pipe(
@@ -108,7 +116,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
    *    true if the user has at least one collection to submit to
    */
   hasAuthorizedCollection(): Observable<boolean> {
-    const searchHref = 'findAuthorized';
+    const searchHref = 'findSubmitAuthorized';
     const options = new FindListOptions();
     options.elementsPerPage = 1;
 
@@ -133,15 +141,18 @@ export class CollectionDataService extends ComColDataService<Collection> {
    * Get the collection's content harvester
    * @param collectionId
    */
-  getContentSource(collectionId: string): Observable<ContentSource> {
-    return this.getHarvesterEndpoint(collectionId).pipe(
-      map((href: string) => new ContentSourceRequest(this.requestService.generateRequestId(), href)),
-      configureRequest(this.requestService),
-      map((request: RestRequest) => request.href),
-      getRequestFromRequestHref(this.requestService),
-      filterSuccessfulResponses(),
-      map((response: ContentSourceSuccessResponse) => response.contentsource)
+  getContentSource(collectionId: string): Observable<RemoteData<ContentSource>> {
+    const href$ = this.getHarvesterEndpoint(collectionId).pipe(
+      isNotEmptyOperator(),
+      take(1)
     );
+
+    href$.subscribe((href: string) => {
+      const request = new ContentSourceRequest(this.requestService.generateRequestId(), href);
+      this.requestService.configure(request);
+    });
+
+    return this.rdbService.buildSingle<ContentSource>(href$);
   }
 
   /**
@@ -169,11 +180,11 @@ export class CollectionDataService extends ComColDataService<Collection> {
     ).subscribe();
 
     // Return updated ContentSource
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        if (!response.isSuccessful) {
-          if (hasValue((response as any).errorMessage)) {
+    return this.rdbService.buildFromRequestUUID<ContentSource>(requestId).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<ContentSource>) => {
+        if (response.hasFailed) {
+          if (hasValue(response.errorMessage)) {
             if (response.statusCode === 422) {
               return this.notificationsService.error(this.translate.instant(this.errorTitle), this.translate.instant(this.contentSourceError), new NotificationOptions(-1));
             } else {
@@ -185,9 +196,9 @@ export class CollectionDataService extends ComColDataService<Collection> {
         }
       }),
       isNotEmptyOperator(),
-      map((response: ContentSourceSuccessResponse | INotification) => {
-        if (isNotEmpty((response as any).contentsource)) {
-          return (response as ContentSourceSuccessResponse).contentsource;
+      map((response: RemoteData<ContentSource> | INotification) => {
+        if (isNotEmpty((response as any).payload)) {
+          return (response as RemoteData<ContentSource>).payload;
         }
         return response as INotification;
       })
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 1ba19df18c8..80989ee00b5 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -10,13 +10,17 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core.reducers';
 import { Community } from '../shared/community.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Item } from '../shared/item.model';
 import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { FindByIDRequest, FindListOptions } from './request.models';
 import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
+import {
+  createFailedRemoteDataObject$, createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import { BitstreamDataService } from './bitstream-data.service';
 
 const LINK_NAME = 'test';
 
@@ -31,6 +35,7 @@ class TestService extends ComColDataService<any> {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
     protected http: HttpClient,
+    protected bitstreamDataService: BitstreamDataService,
     protected comparator: DSOChangeAnalyzer<Community>,
     protected linkPath: string
   ) {
@@ -50,8 +55,9 @@ describe('ComColDataService', () => {
   let cds: CommunityDataService;
   let objectCache: ObjectCacheService;
   let halService: any = {};
+  let bitstreamDataService: BitstreamDataService;
+  let rdbService: RemoteDataBuildService;
 
-  const rdbService = {} as RemoteDataBuildService;
   const store = {} as Store<CoreState>;
   const notificationsService = {} as NotificationsService;
   const http = {} as HttpClient;
@@ -77,6 +83,18 @@ describe('ComColDataService', () => {
     getEndpoint: (linkPath) => observableOf(communitiesEndpoint)
   };
 
+  function initRdbService(): RemoteDataBuildService {
+    return jasmine.createSpyObj('rdbService', {
+      buildSingle : createFailedRemoteDataObject$('Error', 500)
+    });
+  }
+
+  function initBitstreamDataService(): BitstreamDataService {
+    return jasmine.createSpyObj('bitstreamDataService', {
+      deleteByHref: createSuccessfulRemoteDataObject$({})
+    });
+  }
+
   function initMockCommunityDataService(): CommunityDataService {
     return jasmine.createSpyObj('responseCache', {
       getEndpoint: hot('--a-', { a: communitiesEndpoint }),
@@ -108,6 +126,7 @@ describe('ComColDataService', () => {
       halService,
       notificationsService,
       http,
+      bitstreamDataService,
       comparator,
       LINK_NAME
     );
@@ -117,6 +136,8 @@ describe('ComColDataService', () => {
     cds = initMockCommunityDataService();
     requestService = getMockRequestService();
     objectCache = initMockObjectCacheService();
+    bitstreamDataService = initBitstreamDataService();
+    rdbService = initRdbService();
     halService = mockHalService;
     service = initTestService();
   });
@@ -140,41 +161,92 @@ describe('ComColDataService', () => {
       expect(requestService.configure).toHaveBeenCalledWith(expected);
     });
 
-    describe('if the scope Community can be found', () => {
-      beforeEach(() => {
-        cds = initMockCommunityDataService();
-        requestService = getMockRequestService(getRequestEntry$(true));
-        objectCache = initMockObjectCacheService();
-        service = initTestService();
-      });
-
-      it('should fetch the scope Community from the cache', () => {
-        scheduler.schedule(() => service.getBrowseEndpoint(options).subscribe());
-        scheduler.flush();
-        expect(objectCache.getObjectByUUID).toHaveBeenCalledWith(scopeID);
-      });
-
-      it('should return the endpoint to fetch resources within the given scope', () => {
+    describe('if the scope Community can\'t be found', () => {
+      it('should throw an error', () => {
         const result = service.getBrowseEndpoint(options);
-        const expected = '--e-';
+        const expected = cold('--#-', undefined, new Error(`The Community with scope ${scopeID} couldn't be retrieved`));
 
-        scheduler.expectObservable(result).toBe(expected, { e: scopedEndpoint });
+        expect(result).toBeObservable(expected);
       });
     });
 
-    describe('if the scope Community can\'t be found', () => {
+    describe('cache refresh', () => {
+      let communityWithoutParentHref;
+      let data;
+
       beforeEach(() => {
-        cds = initMockCommunityDataService();
-        requestService = getMockRequestService(getRequestEntry$(false));
-        objectCache = initMockObjectCacheService();
-        service = initTestService();
+        spyOn(halService, 'getEndpoint').and.returnValue(observableOf('https://rest.api/core/communities/search/top'));
       });
 
-      it('should throw an error', () => {
-        const result = service.getBrowseEndpoint(options);
-        const expected = cold('--#-', undefined, new Error(`The Community with scope ${scopeID} couldn't be retrieved`));
+      describe('cache refreshed top level community', () => {
+        beforeEach(() => {
+          (rdbService.buildSingle as jasmine.Spy).and.returnValue(createNoContentRemoteDataObject$());
+          data = {
+            dso: Object.assign(new Community(), {
+              metadata: [{
+                key: 'dc.title',
+                value: 'top level community'
+              }]
+            }),
+            _links: {
+              parentCommunity: {
+                href: 'topLevel/parentCommunity'
+              }
+            }
+          };
+          communityWithoutParentHref = {
+            dso: Object.assign(new Community(), {
+              metadata: [{
+                key: 'dc.title',
+                value: 'top level community'
+              }]
+            }),
+            _links: {}
+          };
+        });
+        it('top level community cache refreshed', () => {
+          scheduler.schedule(() => (service as any).refreshCache(data));
+          scheduler.flush();
+          expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith('https://rest.api/core/communities/search/top');
+        });
+        it('top level community without parent link, cache not refreshed', () => {
+          scheduler.schedule(() => (service as any).refreshCache(communityWithoutParentHref));
+          scheduler.flush();
+          expect(requestService.removeByHrefSubstring).not.toHaveBeenCalled();
+        });
+      });
 
-        expect(result).toBeObservable(expected);
+      describe('cache refreshed child community', () => {
+        beforeEach(() => {
+          const parentCommunity = Object.assign(new Community(), {
+            uuid: 'a20da287-e174-466a-9926-f66as300d399',
+            id: 'a20da287-e174-466a-9926-f66as300d399',
+            metadata: [{
+              key: 'dc.title',
+              value: 'parent community'
+            }],
+            _links: {}
+          });
+          (rdbService.buildSingle as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(parentCommunity));
+          data = {
+            dso: Object.assign(new Community(), {
+              metadata: [{
+                key: 'dc.title',
+                value: 'child community'
+              }]
+            }),
+            _links: {
+              parentCommunity: {
+                href: 'child/parentCommunity'
+              }
+            }
+          };
+        });
+        it('child level community cache refreshed', () => {
+          scheduler.schedule(() => (service as any).refreshCache(data));
+          scheduler.flush();
+          expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith('a20da287-e174-466a-9926-f66as300d399');
+        });
       });
     });
 
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index d83518a3b0d..2113a237c58 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -1,42 +1,29 @@
-import {
-  distinctUntilChanged,
-  filter, first,map, mergeMap, share, switchMap,
-  take,
-  tap
-} from 'rxjs/operators';
-import { merge as observableMerge, Observable, throwError as observableThrowError, combineLatest as observableCombineLatest } from 'rxjs';
+import { distinctUntilChanged, filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Community } from '../shared/community.model';
 import { HALLink } from '../shared/hal-link.model';
-import { HALResource } from '../shared/hal-resource.model';
 import { CommunityDataService } from './community-data.service';
 
 import { DataService } from './data.service';
-import { DeleteRequest, FindListOptions, FindByIDRequest, RestRequest } from './request.models';
-import { PaginatedList } from './paginated-list';
+import { FindListOptions, FindByIDRequest } from './request.models';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import {
-  configureRequest,
-  getRemoteDataPayload,
-  getResponseFromEntry,
-  getSucceededRemoteData
-} from '../shared/operators';
-import { CacheableObject } from '../cache/object-cache.reducer';
-import { RestResponse } from '../cache/response.models';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { Bitstream } from '../shared/bitstream.model';
-import { DSpaceObject } from '../shared/dspace-object.model';
+import { Collection } from '../shared/collection.model';
+import { BitstreamDataService } from './bitstream-data.service';
+import { NoContent } from '../shared/NoContent.model';
+import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
-export abstract class ComColDataService<T extends CacheableObject> extends DataService<T> {
+export abstract class ComColDataService<T extends Community | Collection> extends DataService<T> {
   protected abstract cds: CommunityDataService;
   protected abstract objectCache: ObjectCacheService;
   protected abstract halService: HALEndpointService;
-
-  /**
-   * Linkpath of endpoint to delete the logo
-   */
-  protected logoDeleteLinkpath = 'bitstreams';
+  protected abstract bitstreamDataService: BitstreamDataService;
 
   /**
    * Get the scoped endpoint URL by fetching the object with
@@ -61,23 +48,20 @@ export abstract class ComColDataService<T extends CacheableObject> extends DataS
           this.requestService.configure(request);
         }));
 
-      const responses = scopeCommunityHrefObs.pipe(
-        mergeMap((href: string) => this.requestService.getByHref(href)),
-        getResponseFromEntry()
-      );
-      const errorResponses = responses.pipe(
-        filter((response) => !response.isSuccessful),
-        mergeMap(() => observableThrowError(new Error(`The Community with scope ${options.scopeID} couldn't be retrieved`)))
-      );
-      const successResponses = responses.pipe(
-        filter((response) => response.isSuccessful),
-        mergeMap(() => this.objectCache.getObjectByUUID(options.scopeID)),
-        map((hr: HALResource) => hr._links[linkPath]),
+      return scopeCommunityHrefObs.pipe(
+        switchMap((href: string) => this.rdbService.buildSingle<Community>(href)),
+        getFirstCompletedRemoteData(),
+        map((response: RemoteData<Community>) => {
+          if (response.hasFailed) {
+            throw new Error(`The Community with scope ${options.scopeID} couldn't be retrieved`);
+          } else {
+            return response.payload._links[linkPath]
+          }
+        }),
         filter((halLink: HALLink) => isNotEmpty(halLink)),
-        map((halLink: HALLink) => halLink.href)
+        map((halLink: HALLink) => halLink.href),
+        distinctUntilChanged()
       );
-
-      return observableMerge(errorResponses, successResponses).pipe(distinctUntilChanged(), share());
     }
   }
 
@@ -96,27 +80,57 @@ export abstract class ComColDataService<T extends CacheableObject> extends DataS
    */
   public getLogoEndpoint(id: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((href: string) => this.halService.getEndpoint('logo', `${href}/${id}`))
-    )
+      // We can't use HalLinkService to discover the logo link itself, as objects without a logo
+      // don't have the link, and this method is also used in the createLogo method.
+      map((href: string) => new URLCombiner(href, id, 'logo').toString())
+    );
   }
 
   /**
    * Delete the logo from the community or collection
    * @param dso The object to delete the logo from
    */
-  public deleteLogo(dso: DSpaceObject): Observable<RestResponse> {
-    const logo$ = (dso as any).logo;
+  public deleteLogo(dso: T): Observable<RemoteData<NoContent>> {
+    const logo$ = dso.logo;
     if (hasValue(logo$)) {
-      return observableCombineLatest(
-        logo$.pipe(getSucceededRemoteData(), getRemoteDataPayload(), take(1)),
-        this.halService.getEndpoint(this.logoDeleteLinkpath)
-      ).pipe(
-        map(([logo, href]: [Bitstream, string]) => `${href}/${logo.id}`),
-        map((href: string) => new DeleteRequest(this.requestService.generateRequestId(), href)),
-        configureRequest(this.requestService),
-        switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
-        getResponseFromEntry()
+      // We need to fetch the logo before deleting it, because rest doesn't allow us to send a
+      // DELETE request to a `/logo` link. So we need to use the bitstream self link.
+      return logo$.pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((logoRd: RemoteData<Bitstream>) => {
+          if (logoRd.hasFailed) {
+            console.error(`Couldn't retrieve the logo '${dso._links.logo.href}' in order to delete it.`);
+            return [logoRd];
+          } else {
+            return this.bitstreamDataService.deleteByHref(logoRd.payload._links.self.href);
+          }
+        })
       );
+    } else {
+      return createFailedRemoteDataObject$(`The given object doesn't have a logo`, 400);
+    }
+  }
+
+  public refreshCache(dso: T) {
+    const parentCommunityUrl = this.parentCommunityUrlLookup(dso as any);
+    if (!hasValue(parentCommunityUrl)) {
+      return;
     }
+    this.findByHref(parentCommunityUrl).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<any>) => {
+      if (rd.hasSucceeded && isNotEmpty(rd.payload) && isNotEmpty(rd.payload.id)) {
+        this.requestService.removeByHrefSubstring(rd.payload.id)
+      } else {
+        this.halService.getEndpoint('communities/search/top')
+          .pipe(take(1))
+          .subscribe((href) => this.requestService.removeByHrefSubstring(href));
+      }
+    });
+  }
+
+  private parentCommunityUrlLookup(dso: Collection | Community) {
+    const parentCommunity = dso._links.parentCommunity;
+    return isNotEmpty(parentCommunity) ? parentCommunity.href : null;
   }
 }
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index 123c3eccd17..daf8639cb41 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -15,16 +15,17 @@ import { COMMUNITY } from '../shared/community.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ComColDataService } from './comcol-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { FindListOptions, FindListRequest } from './request.models';
 import { RequestService } from './request.service';
+import { BitstreamDataService } from './bitstream-data.service';
 
 @Injectable()
 @dataService(COMMUNITY)
 export class CommunityDataService extends ComColDataService<Community> {
   protected linkPath = 'communities';
-  protected topLinkPath = 'communities/search/top';
+  protected topLinkPath = 'search/top';
   protected cds = this;
 
   constructor(
@@ -34,6 +35,7 @@ export class CommunityDataService extends ComColDataService<Community> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
+    protected bitstreamDataService: BitstreamDataService,
     protected http: HttpClient,
     protected comparator: DSOChangeAnalyzer<Community>
   ) {
diff --git a/src/app/core/data/resource-policy.service.spec.ts b/src/app/core/data/configuration-data.service.spec.ts
similarity index 50%
rename from src/app/core/data/resource-policy.service.spec.ts
rename to src/app/core/data/configuration-data.service.spec.ts
index abed805ca3e..fde55070e15 100644
--- a/src/app/core/data/resource-policy.service.spec.ts
+++ b/src/app/core/data/configuration-data.service.spec.ts
@@ -1,29 +1,37 @@
-import { HttpClient } from '@angular/common/http';
 import { cold, getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ResourcePolicy } from '../shared/resource-policy.model';
+import { FindByIDRequest } from './request.models';
 import { RequestService } from './request.service';
-import { ResourcePolicyService } from './resource-policy.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { ConfigurationDataService } from './configuration-data.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
 
-describe('ResourcePolicyService', () => {
+describe('ConfigurationDataService', () => {
   let scheduler: TestScheduler;
-  let service: ResourcePolicyService;
+  let service: ConfigurationDataService;
+  let halService: HALEndpointService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
   let objectCache: ObjectCacheService;
   const testObject = {
-    uuid: '664184ee-b254-45e8-970d-220e5ccc060b'
-  } as ResourcePolicy;
-  const requestURL = `https://rest.api/rest/api/resourcepolicies/${testObject.uuid}`;
-  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+    uuid: 'test-property',
+    name: 'test-property',
+    values: ['value-1', 'value-2']
+  } as ConfigurationProperty;
+  const configLink = 'https://rest.api/rest/api/config/properties';
+  const requestURL = `https://rest.api/rest/api/config/properties/${testObject.name}`;
+  const requestUUID = 'test-property';
 
   beforeEach(() => {
     scheduler = getTestScheduler();
 
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', {a: configLink})
+    });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
       configure: true
@@ -36,12 +44,11 @@ describe('ResourcePolicyService', () => {
       })
     });
     objectCache = {} as ObjectCacheService;
-    const halService = {} as HALEndpointService;
     const notificationsService = {} as NotificationsService;
     const http = {} as HttpClient;
     const comparator = {} as any;
 
-    service = new ResourcePolicyService(
+    service = new ConfigurationDataService(
       requestService,
       rdbService,
       objectCache,
@@ -50,20 +57,25 @@ describe('ResourcePolicyService', () => {
       http,
       comparator
     );
-
-    spyOn((service as any).dataService, 'findByHref').and.callThrough();
   });
 
-  describe('findByHref', () => {
-    it('should proxy the call to dataservice.findByHref', () => {
-      scheduler.schedule(() => service.findByHref(requestURL));
+  describe('findById', () => {
+    it('should call HALEndpointService with the path to the properties endpoint', () => {
+      scheduler.schedule(() => service.findByPropertyName(testObject.name));
+      scheduler.flush();
+
+      expect(halService.getEndpoint).toHaveBeenCalledWith('properties');
+    });
+
+    it('should configure the proper FindByIDRequest', () => {
+      scheduler.schedule(() => service.findByPropertyName(testObject.name));
       scheduler.flush();
 
-      expect((service as any).dataService.findByHref).toHaveBeenCalledWith(requestURL);
+      expect(requestService.configure).toHaveBeenCalledWith(new FindByIDRequest(requestUUID, requestURL, testObject.name));
     });
 
-    it('should return a RemoteData<ResourcePolicy> for the object with the given URL', () => {
-      const result = service.findByHref(requestURL);
+    it('should return a RemoteData<ConfigurationProperty> for the object with the given name', () => {
+      const result = service.findByPropertyName(testObject.name);
       const expected = cold('a', {
         a: {
           payload: testObject
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
new file mode 100644
index 00000000000..91d5af6ecc6
--- /dev/null
+++ b/src/app/core/data/configuration-data.service.ts
@@ -0,0 +1,63 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core.reducers';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DataService } from './data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';
+
+/* tslint:disable:max-classes-per-file */
+class DataServiceImpl extends DataService<ConfigurationProperty> {
+  protected linkPath = 'properties';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<ConfigurationProperty>) {
+    super();
+  }
+}
+
+@Injectable()
+@dataService(CONFIG_PROPERTY)
+/**
+ * Data Service responsible for retrieving Configuration properties
+ */
+export class ConfigurationDataService {
+  protected linkPath = 'properties';
+  private dataService: DataServiceImpl;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<ConfigurationProperty>) {
+    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+  }
+
+  /**
+   * Finds a configuration property by name
+   * @param name
+   */
+  findByPropertyName(name: string): Observable<RemoteData<ConfigurationProperty>> {
+    return this.dataService.findById(name);
+  }
+}
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/content-source-response-parsing.service.ts b/src/app/core/data/content-source-response-parsing.service.ts
index 95e25db6133..4db9171754a 100644
--- a/src/app/core/data/content-source-response-parsing.service.ts
+++ b/src/app/core/data/content-source-response-parsing.service.ts
@@ -1,20 +1,19 @@
 import { Injectable } from '@angular/core';
-import { ContentSourceSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { ContentSource } from '../shared/content-source.model';
 import { MetadataConfig } from '../shared/metadata-config.model';
-import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 
 @Injectable()
 /**
- * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to a ContentSource object
- * wrapped in a ContentSourceSuccessResponse
+ * A ResponseParsingService used to parse RawRestResponse coming from the REST API to a ContentSource object
  */
-export class ContentSourceResponseParsingService implements ResponseParsingService {
+export class ContentSourceResponseParsingService extends DspaceRestResponseParsingService {
 
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
     const payload = data.payload;
 
     const deserialized = new DSpaceSerializer(ContentSource).deserialize(payload);
@@ -25,7 +24,9 @@ export class ContentSourceResponseParsingService implements ResponseParsingServi
     }
     deserialized.metadataConfigs = metadataConfigs;
 
-    return new ContentSourceSuccessResponse(deserialized, data.statusCode, data.statusText);
+    this.addToObjectCache(deserialized, request, data)
+
+    return new ParsedResponse(data.statusCode, deserialized._links.self);
   }
 
 }
diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
index a99fc542695..9e70f6c8b48 100644
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -18,6 +18,8 @@ import { FindListOptions, PatchRequest } from './request.models';
 import { RequestService } from './request.service';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RequestParam } from '../cache/models/request-param.model';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 
 const endpoint = 'https://rest.api/core';
 
@@ -65,7 +67,7 @@ describe('DataService', () => {
   function initTestService(): TestService {
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
-    rdbService = {} as RemoteDataBuildService;
+    rdbService = getMockRemoteDataBuildService();
     notificationsService = {} as NotificationsService;
     http = {} as HttpClient;
     comparator = new DummyChangeAnalyzer() as any;
@@ -150,7 +152,8 @@ describe('DataService', () => {
         currentPage: 6,
         elementsPerPage: 10,
         sort: sortOptions,
-        startsWith: 'ab'
+        startsWith: 'ab',
+
       };
       const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
         `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
@@ -160,6 +163,26 @@ describe('DataService', () => {
       });
     });
 
+    it('should include all searchParams in href if any provided in options', () => {
+      options = { searchParams: [
+        new RequestParam('param1', 'test'),
+        new RequestParam('param2', 'test2'),
+        ] };
+      const expected = `${endpoint}?param1=test&param2=test2`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include linkPath in href if any provided', () => {
+      const expected = `${endpoint}/test/entries`;
+
+      (service as any).getFindAllHref({}, 'test/entries').subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
     it('should include single linksToFollow as embed', () => {
       const expected = `${endpoint}?embed=bundles`;
 
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 7cbfb2ad036..08c0285a640 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -9,49 +9,69 @@ import {
   first,
   map,
   mergeMap,
-  skipWhile,
-  switchMap,
   take,
-  tap
+  takeWhile, switchMap, tap,
 } from 'rxjs/operators';
-import { hasValue, hasValueOperator, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
 import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { getClassForType } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestParam } from '../cache/models/request-param.model';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { ErrorResponse, RestResponse } from '../cache/response.models';
 import { CoreState } from '../core.reducers';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import {
-  configureRequest,
   getRemoteDataPayload,
-  getResponseFromEntry,
-  getSucceededRemoteData
+  getFirstSucceededRemoteData,
 } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { ChangeAnalyzer } from './change-analyzer';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import {
   CreateRequest,
-  DeleteByIDRequest,
   FindByIDRequest,
   FindListOptions,
   FindListRequest,
   GetRequest,
-  PatchRequest
+  PatchRequest,
+  PutRequest, DeleteRequest
 } from './request.models';
-import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
 import { RestRequestMethod } from './rest-request-method';
+import { UpdateDataService } from './update-data.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { NoContent } from '../shared/NoContent.model';
+
+/**
+ * An operator that will call the given function if the incoming RemoteData is stale and
+ * shouldReRequest is true
+ *
+ * @param shouldReRequest  Whether or not to call the re-request function if the RemoteData is stale
+ * @param requestFn        The function to call if the RemoteData is stale and shouldReRequest is
+ *                         true
+ */
+export const reRequestStaleRemoteData = <T>(shouldReRequest: boolean, requestFn: () => Observable<RemoteData<T>>) =>
+  (source: Observable<RemoteData<T>>): Observable<RemoteData<T>> => {
+    if (shouldReRequest === true) {
+      return source.pipe(
+        tap((remoteData: RemoteData<T>) => {
+          if (hasValue(remoteData) && remoteData.isStale) {
+            requestFn();
+          }
+        })
+      )
+    } else {
+      return source;
+    }
+  };
 
-export abstract class DataService<T extends CacheableObject> {
+export abstract class DataService<T extends CacheableObject> implements UpdateDataService<T> {
   protected abstract requestService: RequestService;
   protected abstract rdbService: RemoteDataBuildService;
   protected abstract store: Store<CoreState>;
@@ -74,6 +94,13 @@ export abstract class DataService<T extends CacheableObject> {
    * @returns {Observable<string>}
    */
   getBrowseEndpoint(options: FindListOptions = {}, linkPath?: string): Observable<string> {
+    return this.getEndpoint();
+  }
+
+  /**
+   * Get the base endpoint for all requests
+   */
+  protected getEndpoint(): Observable<string> {
     return this.halService.getEndpoint(this.linkPath);
   }
 
@@ -86,13 +113,17 @@ export abstract class DataService<T extends CacheableObject> {
    *    Return an observable that emits created HREF
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  protected getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
-    let result$: Observable<string>;
+  public getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
+    let endpoint$: Observable<string>;
     const args = [];
 
-    result$ = this.getBrowseEndpoint(options, linkPath).pipe(distinctUntilChanged());
+    endpoint$ = this.getBrowseEndpoint(options).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      map((href: string) => isNotEmpty(linkPath) ? `${href}/${linkPath}` : href),
+      distinctUntilChanged()
+    );
 
-    return result$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
+    return endpoint$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
   }
 
   /**
@@ -104,18 +135,12 @@ export abstract class DataService<T extends CacheableObject> {
    *    Return an observable that emits created HREF
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  protected getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
+  public getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
     let result$: Observable<string>;
     const args = [];
 
     result$ = this.getSearchEndpoint(searchMethod);
 
-    if (hasValue(options.searchParams)) {
-      options.searchParams.forEach((param: SearchParam) => {
-        args.push(`${param.fieldName}=${param.fieldValue}`);
-      })
-    }
-
     return result$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
   }
 
@@ -129,7 +154,7 @@ export abstract class DataService<T extends CacheableObject> {
    *    Return an observable that emits created HREF
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  protected buildHrefFromFindOptions(href: string, options: FindListOptions, extraArgs: string[] = [], ...linksToFollow: Array<FollowLinkConfig<T>>): string {
+  public buildHrefFromFindOptions(href: string, options: FindListOptions, extraArgs: string[] = [], ...linksToFollow: Array<FollowLinkConfig<T>>): string {
     let args = [...extraArgs];
 
     if (hasValue(options.currentPage) && typeof options.currentPage === 'number') {
@@ -145,6 +170,11 @@ export abstract class DataService<T extends CacheableObject> {
     if (hasValue(options.startsWith)) {
       args = [...args, `startsWith=${options.startsWith}`];
     }
+    if (hasValue(options.searchParams)) {
+      options.searchParams.forEach((param: RequestParam) => {
+        args = [...args, `${param.fieldName}=${param.fieldValue}`];
+      })
+    }
     args = this.addEmbedParams(args, ...linksToFollow);
     if (isNotEmpty(args)) {
       return new URLCombiner(href, `?${args.join('&')}`).toString();
@@ -153,6 +183,33 @@ export abstract class DataService<T extends CacheableObject> {
     }
   }
 
+  /**
+   * Turn an array of RequestParam into a query string and combine it with the given HREF
+   *
+   * @param href The HREF to which the query string should be appended
+   * @param params Array with additional params to combine with query string
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   *
+   * @return {Observable<string>}
+   * Return an observable that emits created HREF
+   */
+  protected buildHrefWithParams(href: string, params: RequestParam[], ...linksToFollow: Array<FollowLinkConfig<T>>): string {
+
+    let  args = [];
+    if (hasValue(params)) {
+      params.forEach((param: RequestParam) => {
+        args.push(`${param.fieldName}=${param.fieldValue}`);
+      })
+    }
+
+    args = this.addEmbedParams(args, ...linksToFollow);
+
+    if (isNotEmpty(args)) {
+      return new URLCombiner(href, `?${args.join('&')}`).toString();
+    } else {
+      return href;
+    }
+  }
   /**
    * Adds the embed options to the link for the request
    * @param args            params for the query string
@@ -191,34 +248,45 @@ export abstract class DataService<T extends CacheableObject> {
    * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
    * info should be added to the objects
    *
-   * @param options         Find list options object
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @param options           Find list options object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    * @return {Observable<RemoteData<PaginatedList<T>>>}
    *    Return an observable that emits object list
    */
-  findAll(options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
-    return this.findList(this.getFindAllHref(options), options, ...linksToFollow);
+  findAll(options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
+    return this.findList(this.getFindAllHref(options), options, reRequestOnStale, ...linksToFollow);
   }
 
   /**
    * Returns an observable of {@link RemoteData} of an object, based on href observable,
    * with a list of {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
-   * @param href$           Observable of href of object we want to retrieve
-   * @param options         Find list options object
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @param href$             Observable of href of object we want to retrieve
+   * @param options           Find list options object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  protected findList(href$, options: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<T>>) {
+  protected findList(href$, options: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<T>>) {
+    const requestId = this.requestService.generateRequestId();
+
     href$.pipe(
       first((href: string) => hasValue(href)))
       .subscribe((href: string) => {
-        const request = new FindListRequest(this.requestService.generateRequestId(), href, options);
+        const request = new FindListRequest(requestId, href, options);
         if (hasValue(this.responseMsToLive)) {
           request.responseMsToLive = this.responseMsToLive;
         }
         this.requestService.configure(request);
       });
 
-    return this.rdbService.buildList<T>(href$, ...linksToFollow) as Observable<RemoteData<PaginatedList<T>>>;
+    return this.rdbService.buildList<T>(href$, ...linksToFollow).pipe(
+      reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.findList(href$, options, reRequestOnStale, ...linksToFollow))
+    ) as Observable<RemoteData<PaginatedList<T>>>;
   }
 
   /**
@@ -232,59 +300,91 @@ export abstract class DataService<T extends CacheableObject> {
   }
 
   /**
-   * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the object
-   * @param id              ID of object we want to retrieve
+   * Create an observable for the HREF of a specific object based on its identifier
+   * @param resourceID The identifier for the object
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  findById(id: string, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<T>> {
-    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, encodeURIComponent(id), ...linksToFollow)));
+  getIDHrefObs(resourceID: string, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
+    return this.getEndpoint().pipe(
+      map((endpoint: string) => this.getIDHref(endpoint, resourceID, ...linksToFollow)));
+  }
 
-    hrefObs.pipe(
-      find((href: string) => hasValue(href)))
-      .subscribe((href: string) => {
-        const request = new FindByIDRequest(this.requestService.generateRequestId(), href, id);
-        if (hasValue(this.responseMsToLive)) {
-          request.responseMsToLive = this.responseMsToLive;
-        }
-        this.requestService.configure(request);
-      });
+  /**
+   * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of
+   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
+   * @param id                ID of object we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
+   */
+  findById(id: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<T>> {
+    const requestId = this.requestService.generateRequestId();
+
+    const href$ = this.getIDHrefObs(encodeURIComponent(id), ...linksToFollow).pipe(
+      isNotEmptyOperator(),
+      take(1)
+    );
+
+    href$.subscribe((href: string) => {
+      const request = new FindByIDRequest(requestId, href, id);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.configure(request);
+    });
 
-    return this.rdbService.buildSingle<T>(hrefObs, ...linksToFollow);
+    return this.rdbService.buildSingle<T>(href$, ...linksToFollow).pipe(
+      reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.findById(id, reRequestOnStale, ...linksToFollow))
+    );
   }
 
   /**
-   * Returns an observable of {@link RemoteData} of an object, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the object
-   * @param href            The url of object we want to retrieve
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * Returns an observable of {@link RemoteData} of an object, based on an href, with a list of
+   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
+   * @param href              The url of object we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  findByHref(href: string, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<T>> {
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<T>> {
     const requestHref = this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow);
-    const request = new GetRequest(this.requestService.generateRequestId(), requestHref);
+    const requestId = this.requestService.generateRequestId();
+    const request = new GetRequest(requestId, requestHref);
     if (hasValue(this.responseMsToLive)) {
       request.responseMsToLive = this.responseMsToLive;
     }
     this.requestService.configure(request);
-    return this.rdbService.buildSingle<T>(href, ...linksToFollow);
+    return this.rdbService.buildSingle<T>(href, ...linksToFollow).pipe(
+      reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.findByHref(href, reRequestOnStale, ...linksToFollow))
+    );
   }
 
   /**
-   * Returns a list of observables of {@link RemoteData} of objects, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the object
-   * @param href            The url of object we want to retrieve
-   * @param findListOptions Find list options object
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * Returns a list of observables of {@link RemoteData} of objects, based on an href, with a list
+   * of {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
+   * @param href              The url of object we want to retrieve
+   * @param findListOptions   Find list options object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  findAllByHref(href: string, findListOptions: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
+  findAllByHref(href: string, findListOptions: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
     const requestHref = this.buildHrefFromFindOptions(href, findListOptions, [], ...linksToFollow);
-    const request = new GetRequest(this.requestService.generateRequestId(), requestHref);
+    const requestId = this.requestService.generateRequestId();
+    const request = new GetRequest(requestId, requestHref);
     if (hasValue(this.responseMsToLive)) {
       request.responseMsToLive = this.responseMsToLive;
     }
     this.requestService.configure(request);
-    return this.rdbService.buildList<T>(requestHref, ...linksToFollow);
+    return this.rdbService.buildList<T>(requestHref, ...linksToFollow).pipe(
+      reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.findAllByHref(href, findListOptions, reRequestOnStale, ...linksToFollow))
+    );
   }
 
   /**
@@ -293,243 +393,195 @@ export abstract class DataService<T extends CacheableObject> {
    * @param searchMethod The search method for the object
    */
   protected getSearchEndpoint(searchMethod: string): Observable<string> {
-    return this.halService.getEndpoint(`${this.linkPath}/search`).pipe(
+    return this.halService.getEndpoint(this.linkPath).pipe(
       filter((href: string) => isNotEmpty(href)),
-      map((href: string) => `${href}/${searchMethod}`));
+      map((href: string) => `${href}/search/${searchMethod}`));
   }
 
   /**
    * Make a new FindListRequest with given search method
    *
-   * @param searchMethod The search method for the object
-   * @param options The [[FindListOptions]] object
-   * @param linksToFollow The array of [[FollowLinkConfig]]
+   * @param searchMethod      The search method for the object
+   * @param options           The [[FindListOptions]] object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     The array of [[FollowLinkConfig]]
    * @return {Observable<RemoteData<PaginatedList<T>>}
    *    Return an observable that emits response from the server
    */
-  searchBy(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
-
+  searchBy(searchMethod: string, options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<T>>> {
+    const requestId = this.requestService.generateRequestId();
     const hrefObs = this.getSearchByHref(searchMethod, options, ...linksToFollow);
 
-    return hrefObs.pipe(
-      find((href: string) => hasValue(href)),
-      tap((href: string) => {
-          this.requestService.removeByHrefSubstring(href);
-          const request = new FindListRequest(this.requestService.generateRequestId(), href, options);
-          request.responseMsToLive = 10 * 1000;
+    hrefObs.pipe(
+      find((href: string) => hasValue(href))
+    ).subscribe((href: string) => {
+      const request = new FindListRequest(requestId, href, options);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.configure(request);
+    });
 
-          this.requestService.configure(request);
-        }
-      ),
-      switchMap((href) => this.requestService.getByHref(href)),
-      skipWhile((requestEntry) => hasValue(requestEntry) && requestEntry.completed),
-      switchMap((href) =>
-        this.rdbService.buildList<T>(hrefObs, ...linksToFollow) as Observable<RemoteData<PaginatedList<T>>>
-      )
+    return this.rdbService.buildList(hrefObs, ...linksToFollow).pipe(
+      reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.searchBy(searchMethod, options, reRequestOnStale, ...linksToFollow))
     );
   }
 
   /**
    * Send a patch request for a specified object
-   * @param {T} dso The object to send a patch request for
+   * @param {T} object The object to send a patch request for
    * @param {Operation[]} operations The patch operations to be performed
    */
-  patch(dso: T, operations: Operation[]): Observable<RestResponse> {
+  patch(object: T, operations: Operation[]): Observable<RemoteData<T>> {
     const requestId = this.requestService.generateRequestId();
 
     const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, dso.uuid)));
+      map((endpoint: string) => this.getIDHref(endpoint, object.uuid)));
 
     hrefObs.pipe(
       find((href: string) => hasValue(href)),
-      map((href: string) => {
-        const request = new PatchRequest(requestId, href, operations);
-        this.requestService.configure(request);
-      })
-    ).subscribe();
+    ).subscribe((href: string) => {
+      const request = new PatchRequest(requestId, href, operations);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.configure(request);
+    });
 
-    return this.requestService.getByUUID(requestId).pipe(
-      find((request: RequestEntry) => request.completed),
-      map((request: RequestEntry) => request.response)
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
-  /**
-   * Add a new patch to the object cache
-   * The patch is derived from the differences between the given object and its version in the object cache
-   * @param {DSpaceObject} object The given object
-   */
-  update(object: T): Observable<RemoteData<T>> {
-    const oldVersion$ = this.findByHref(object._links.self.href);
+  createPatchFromCache(object: T): Observable<Operation[]> {
+    const oldVersion$ = this.findByHref(object._links.self.href, false);
     return oldVersion$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      mergeMap((oldVersion: T) => {
-          const operations = this.comparator.diff(oldVersion, object);
-          if (isNotEmpty(operations)) {
-            this.objectCache.addPatch(object._links.self.href, operations);
-          }
-          return this.findByHref(object._links.self.href);
-        }
-      ));
+      map((oldVersion: T) => this.comparator.diff(oldVersion, object)));
   }
 
   /**
-   * Create a new DSpaceObject on the server, and store the response
-   * in the object cache
+   * Send a PUT request for the specified object
    *
-   * @param {DSpaceObject} dso
-   *    The object to create
-   * @param {string} parentUUID
-   *    The UUID of the parent to create the new object under
+   * @param object The object to send a put request for.
    */
-  create(dso: T, parentUUID: string): Observable<RemoteData<T>> {
+  put(object: T): Observable<RemoteData<T>> {
     const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(this.linkPath).pipe(
-      isNotEmptyOperator(),
-      distinctUntilChanged(),
-      map((endpoint: string) => parentUUID ? `${endpoint}?parent=${parentUUID}` : endpoint)
-    );
+    const serializedObject = new DSpaceSerializer(object.constructor as GenericConstructor<{}>).serialize(object);
+    const request = new PutRequest(requestId, object._links.self.href, serializedObject);
 
-    const serializedDso = new DSpaceSerializer(getClassForType((dso as any).type)).serialize(dso);
+    if (hasValue(this.responseMsToLive)) {
+      request.responseMsToLive = this.responseMsToLive;
+    }
 
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => new CreateRequest(requestId, endpoint, JSON.stringify(serializedDso)))
-    );
+    this.requestService.configure(request);
 
-    // Execute the post request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
-
-    // Resolve self link for new object
-    const selfLink$ = this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        if (!response.isSuccessful && response instanceof ErrorResponse) {
-          this.notificationsService.error('Server Error:', response.errorMessage, new NotificationOptions(-1));
-        } else {
-          return response;
-        }
-      }),
-      map((response: any) => {
-        if (isNotEmpty(response.resourceSelfLinks)) {
-          return response.resourceSelfLinks[0];
-        }
-      }),
-      distinctUntilChanged()
-    ) as Observable<string>;
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
 
-    return selfLink$.pipe(
-      switchMap((selfLink: string) => this.findByHref(selfLink)),
-    )
+  /**
+   * Add a new patch to the object cache
+   * The patch is derived from the differences between the given object and its version in the object cache
+   * @param {DSpaceObject} object The given object
+   */
+  update(object: T): Observable<RemoteData<T>> {
+    return this.createPatchFromCache(object)
+      .pipe(
+        mergeMap((operations: Operation[]) => {
+            if (isNotEmpty(operations)) {
+              this.objectCache.addPatch(object._links.self.href, operations);
+            }
+            return this.findByHref(object._links.self.href, true);
+          }
+        )
+      );
   }
 
   /**
    * Create a new DSpaceObject on the server, and store the response
-   * in the object cache, returns observable of the response to determine success
+   * in the object cache
    *
-   * @param {DSpaceObject} dso
+   * @param {CacheableObject} object
    *    The object to create
+   * @param {RequestParam[]} params
+   *    Array with additional params to combine with query string
    */
-  tryToCreate(dso: T): Observable<RestResponse> {
+  create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>> {
     const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(this.linkPath).pipe(
+    const endpoint$ = this.getEndpoint().pipe(
       isNotEmptyOperator(),
       distinctUntilChanged(),
+      map((endpoint: string) => this.buildHrefWithParams(endpoint, params))
     );
 
-    const serializedDso = new DSpaceSerializer(getClassForType((dso as any).type)).serialize(dso);
-
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => new CreateRequest(requestId, endpoint, JSON.stringify(serializedDso)))
-    );
+    const serializedObject = new DSpaceSerializer(getClassForType(object.type)).serialize(object);
 
-    // Execute the post request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
+    endpoint$.pipe(
+      take(1)
+    ).subscribe((endpoint: string) => {
+      const request = new CreateRequest(requestId, endpoint, JSON.stringify(serializedObject));
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.configure(request);
+    });
 
-    return this.fetchResponse(requestId);
-  }
+    const result$ = this.rdbService.buildFromRequestUUID<T>(requestId);
 
-  /**
-   * Gets the restResponse from the requestService
-   * @param requestId
-   */
-  protected fetchResponse(requestId: string): Observable<RestResponse> {
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        return response;
-      })
-    );
-  }
-
-  /**
-   * Delete an existing DSpace Object on the server
-   * @param dsoID The DSpace Object' id to be removed
-   * @param copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
-   *                            metadata should be saved as real metadata
-   * @return an observable that emits true when the deletion was successful, false when it failed
-   */
-  delete(dsoID: string, copyVirtualMetadata?: string[]): Observable<boolean> {
-    const requestId = this.deleteAndReturnRequestId(dsoID, copyVirtualMetadata);
+    // TODO a dataservice is not the best place to show a notification,
+    // this should move up to the components that use this method
+    result$.pipe(
+      takeWhile((rd: RemoteData<T>) => rd.isLoading, true)
+    ).subscribe((rd: RemoteData<T>) => {
+      if (rd.hasFailed) {
+        this.notificationsService.error('Server Error:', rd.errorMessage, new NotificationOptions(-1));
+      }
+    });
 
-    return this.requestService.getByUUID(requestId).pipe(
-      find((request: RequestEntry) => request.completed),
-      map((request: RequestEntry) => request.response.isSuccessful)
-    );
+    return result$;
   }
 
   /**
    * Delete an existing DSpace Object on the server
-   * @param dsoID The DSpace Object' id to be removed
-   * @param copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
+   * @param   objectId The id of the object to be removed
+   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
    *                            metadata should be saved as real metadata
-   * Return an observable of the completed response
+   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
+   *          errorMessage, timeCompleted, etc
    */
-  deleteAndReturnResponse(dsoID: string, copyVirtualMetadata?: string[]): Observable<RestResponse> {
-    const requestId = this.deleteAndReturnRequestId(dsoID, copyVirtualMetadata);
-
-    return this.requestService.getByUUID(requestId).pipe(
-      hasValueOperator(),
-      find((request: RequestEntry) => request.completed),
-      map((request: RequestEntry) => request.response)
+  delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.getIDHrefObs(objectId).pipe(
+      switchMap((href: string) => this.deleteByHref(href, copyVirtualMetadata))
     );
   }
 
   /**
    * Delete an existing DSpace Object on the server
-   * @param dsoID The DSpace Object' id to be removed
-   * @param copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
+   * @param   href The self link of the object to be removed
+   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
    *                            metadata should be saved as real metadata
-   * Return the delete request's ID
+   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
+   *          errorMessage, timeCompleted, etc
    */
-  private deleteAndReturnRequestId(dsoID: string, copyVirtualMetadata?: string[]): string {
+  deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     const requestId = this.requestService.generateRequestId();
 
-    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, dsoID)));
+    if (copyVirtualMetadata) {
+      copyVirtualMetadata.forEach((id) =>
+        href += (href.includes('?') ? '&' : '?')
+          + 'copyVirtualMetadata='
+          + id
+      );
+    }
 
-    hrefObs.pipe(
-      find((href: string) => hasValue(href)),
-      map((href: string) => {
-        if (copyVirtualMetadata) {
-          copyVirtualMetadata.forEach((id) =>
-            href += (href.includes('?') ? '&' : '?')
-              + 'copyVirtualMetadata='
-              + id
-          );
-        }
-        const request = new DeleteByIDRequest(requestId, href, dsoID);
-        this.requestService.configure(request);
-      })
-    ).subscribe();
+    const request = new DeleteRequest(requestId, href);
+    if (hasValue(this.responseMsToLive)) {
+      request.responseMsToLive = this.responseMsToLive;
+    }
+    this.requestService.configure(request);
 
-    return requestId;
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -540,4 +592,15 @@ export abstract class DataService<T extends CacheableObject> {
     this.requestService.commit(method);
   }
 
+  /**
+   * Return the links to traverse from the root of the api to the
+   * endpoint this DataService represents
+   *
+   * e.g. if the api root links to 'foo', and the endpoint at 'foo'
+   * links to 'bar' the linkPath for the BarDataService would be
+   * 'foo/bar'
+   */
+  getLinkPath(): string {
+    return this.linkPath;
+  }
 }
diff --git a/src/app/core/data/debug-response-parsing.service.ts b/src/app/core/data/debug-response-parsing.service.ts
index 174abec8971..fbc07cbb395 100644
--- a/src/app/core/data/debug-response-parsing.service.ts
+++ b/src/app/core/data/debug-response-parsing.service.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 
 @Injectable()
 export class DebugResponseParsingService implements ResponseParsingService {
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+  parse(request: RestRequest, data: RawRestResponse): RestResponse {
     console.log('request', request, 'data', data);
     return undefined;
   }
diff --git a/src/app/core/data/default-change-analyzer.service.ts b/src/app/core/data/default-change-analyzer.service.ts
index 20218925fb9..0c3510172b8 100644
--- a/src/app/core/data/default-change-analyzer.service.ts
+++ b/src/app/core/data/default-change-analyzer.service.ts
@@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
 import { compare } from 'fast-json-patch';
 import { Operation } from 'fast-json-patch/lib/core';
 import { getClassForType } from '../cache/builders/build-decorators';
-import { CacheableObject } from '../cache/object-cache.reducer';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { TypedObject } from '../cache/object-cache.reducer';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { ChangeAnalyzer } from './change-analyzer';
 
 /**
@@ -11,7 +11,7 @@ import { ChangeAnalyzer } from './change-analyzer';
  * CacheableObjects
  */
 @Injectable()
-export class DefaultChangeAnalyzer<T extends CacheableObject> implements ChangeAnalyzer<T> {
+export class DefaultChangeAnalyzer<T extends TypedObject> implements ChangeAnalyzer<T> {
   /**
    * Compare the metadata of two CacheableObject and return the differences as
    * a JsonPatch Operation Array
diff --git a/src/app/core/data/dso-redirect-data.service.spec.ts b/src/app/core/data/dso-redirect-data.service.spec.ts
index ca62347883c..a9aaf473c3a 100644
--- a/src/app/core/data/dso-redirect-data.service.spec.ts
+++ b/src/app/core/data/dso-redirect-data.service.spec.ts
@@ -11,6 +11,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { DsoRedirectDataService } from './dso-redirect-data.service';
 import { FindByIDRequest, IdentifierType } from './request.models';
 import { RequestService } from './request.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 
 describe('DsoRedirectDataService', () => {
   let scheduler: TestScheduler;
@@ -47,16 +48,10 @@ describe('DsoRedirectDataService', () => {
       navigate: jasmine.createSpy('navigate')
     };
 
-    remoteData = {
-      isSuccessful: true,
-      error: undefined,
-      hasSucceeded: true,
-      isLoading: false,
-      payload: {
-        type: 'item',
-        uuid: '123456789'
-      }
-    };
+    remoteData = createSuccessfulRemoteDataObject({
+      type: 'item',
+      uuid: '123456789'
+    });
 
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: cold('a', {
diff --git a/src/app/core/data/dso-redirect-data.service.ts b/src/app/core/data/dso-redirect-data.service.ts
index 87259a42795..0ff1d36cc96 100644
--- a/src/app/core/data/dso-redirect-data.service.ts
+++ b/src/app/core/data/dso-redirect-data.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { take, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
@@ -11,12 +11,12 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core.reducers';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFinishedRemoteData } from '../shared/operators';
 import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RemoteData } from './remote-data';
 import { FindByIDRequest, IdentifierType } from './request.models';
 import { RequestService } from './request.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 
 @Injectable()
 export class DsoRedirectDataService extends DataService<any> {
@@ -56,8 +56,7 @@ export class DsoRedirectDataService extends DataService<any> {
   findByIdAndIDType(id: string, identifierType = IdentifierType.UUID): Observable<RemoteData<FindByIDRequest>> {
     this.setLinkPath(identifierType);
     return this.findById(id).pipe(
-      getFinishedRemoteData(),
-      take(1),
+      getFirstCompletedRemoteData(),
       tap((response) => {
         if (response.hasSucceeded) {
           const uuid = response.payload.uuid;
diff --git a/src/app/core/data/dso-response-parsing.service.ts b/src/app/core/data/dso-response-parsing.service.ts
index a4d4941bc85..0dfdffaf539 100644
--- a/src/app/core/data/dso-response-parsing.service.ts
+++ b/src/app/core/data/dso-response-parsing.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { RestResponse, DSOSuccessResponse } from '../cache/response.models';
 import { RestRequest } from './request.models';
 
@@ -20,7 +20,7 @@ export class DSOResponseParsingService extends BaseResponseParsingService implem
     super();
   }
 
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+  parse(request: RestRequest, data: RawRestResponse): RestResponse {
     let processRequestDTO;
     // Prevent empty pages returning an error, initialize empty array instead.
     if (hasValue(data.payload) && hasValue(data.payload.page) && data.payload.page.totalElements === 0) {
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index 61cc98281e2..be71e71fc2d 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -15,6 +15,8 @@ import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
+import { FindListOptions } from './request.models';
+import { PaginatedList } from './paginated-list.model';
 
 /* tslint:disable:max-classes-per-file */
 class DataServiceImpl extends DataService<DSpaceObject> {
@@ -55,7 +57,42 @@ export class DSpaceObjectDataService {
     this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
   }
 
-  findById(uuid: string): Observable<RemoteData<DSpaceObject>> {
-    return this.dataService.findById(uuid);
+  /**
+   * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param id                ID of object we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findById(id: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<DSpaceObject>>): Observable<RemoteData<DSpaceObject>> {
+    return this.dataService.findById(id, reRequestOnStale, ...linksToFollow);
+
+  }
+  /**
+   * Returns an observable of {@link RemoteData} of an object, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param href              The url of object we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<DSpaceObject>>): Observable<RemoteData<DSpaceObject>> {
+    return this.dataService.findByHref(href, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Returns a list of observables of {@link RemoteData} of objects, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param href              The url of object we want to retrieve
+   * @param findListOptions   Find list options object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findAllByHref(href: string, findListOptions: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<DSpaceObject>>): Observable<RemoteData<PaginatedList<DSpaceObject>>> {
+    return this.dataService.findAllByHref(href, findListOptions, reRequestOnStale, ...linksToFollow);
+  }
+
 }
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/dspace-rest-response-parsing.service.ts b/src/app/core/data/dspace-rest-response-parsing.service.ts
new file mode 100644
index 00000000000..1d069573682
--- /dev/null
+++ b/src/app/core/data/dspace-rest-response-parsing.service.ts
@@ -0,0 +1,265 @@
+import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { Serializer } from '../serializer';
+import { PageInfo } from '../shared/page-info.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { PaginatedList, buildPaginatedList } from './paginated-list.model';
+import { getClassForType } from '../cache/builders/build-decorators';
+import { RestRequest } from './request.models';
+import { environment } from '../../../environments/environment';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { Injectable } from '@angular/core';
+import { ResponseParsingService } from './parsing.service';
+import { ParsedResponse } from '../cache/response.models';
+import { RestRequestMethod } from './rest-request-method';
+import { getUrlWithoutEmbedParams } from '../index/index.selectors';
+
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * Return true if obj has a value for `_links.self`
+ *
+ * @param {any} obj The object to test
+ */
+export function isCacheableObject(obj: any): boolean {
+  return hasValue(obj) && hasValue(obj._links) && hasValue(obj._links.self) && hasValue(obj._links.self.href);
+}
+
+/**
+ * Return true if halObj has a value for `page` with properties
+ * `size`, `totalElements`, `totalPages`, `number`
+ *
+ * @param {any} halObj The object to test
+ */
+export function isRestPaginatedList(halObj: any): boolean {
+  return hasValue(halObj.page) &&
+    hasValue(halObj.page.size) &&
+    hasValue(halObj.page.totalElements) &&
+    hasValue(halObj.page.totalPages) &&
+    hasValue(halObj.page.number);
+}
+
+/**
+ * Split a url into parts
+ *
+ * @param url the url to split
+ */
+const splitUrlInParts = (url: string): string[] => {
+  return url.split('?')
+    .map((part) => part.split('&'))
+    .reduce((combined, current) => [...combined, ...current])
+}
+
+@Injectable({ providedIn: 'root' })
+export class DspaceRestResponseParsingService implements ResponseParsingService {
+  protected serializerConstructor: GenericConstructor<Serializer<any>> = DSpaceSerializer;
+
+  constructor(
+    protected objectCache: ObjectCacheService,
+  ) {
+  }
+
+  parse(request: RestRequest, response: RawRestResponse): ParsedResponse {
+    response = this.ensureSelfLink(request, response);
+
+    let alternativeURL: string;
+    if (request.method === RestRequestMethod.GET) {
+      // only store an alternative URL when parsing a GET request, as there are cases when e.g. a
+      // POST or a PUT would have a different response
+      alternativeURL = getUrlWithoutEmbedParams(request.href);
+    }
+
+    const processRequestDTO = this.process<DSpaceObject>(response.payload, request, alternativeURL);
+
+    if (hasValue(processRequestDTO)) {
+      if (isCacheableObject(processRequestDTO)) {
+        return new ParsedResponse(response.statusCode, processRequestDTO._links.self);
+      } else {
+        return new ParsedResponse(response.statusCode, undefined, processRequestDTO);
+      }
+    } else {
+      return new ParsedResponse(response.statusCode);
+    }
+  }
+
+  public process<ObjectDomain>(data: any, request: RestRequest, alternativeURL?: string): any {
+    if (isNotEmpty(data)) {
+      if (hasNoValue(data) || (typeof data !== 'object')) {
+        return data;
+      } else if (isRestPaginatedList(data)) {
+        return this.processPaginatedList(data, request, alternativeURL);
+      } else if (Array.isArray(data)) {
+        return this.processArray(data, request);
+      } else if (isCacheableObject(data)) {
+        const object = this.deserialize(data);
+        if (isNotEmpty(data._embedded)) {
+          Object
+            .keys(data._embedded)
+            .filter((property) => data._embedded.hasOwnProperty(property))
+            .forEach((property) => {
+              this.process<ObjectDomain>(data._embedded[property], request, data._links[property].href);
+            });
+        }
+
+        this.addToObjectCache(object, request, data, alternativeURL);
+        return object;
+      }
+      const result = {};
+      Object.keys(data)
+        .filter((property) => data.hasOwnProperty(property))
+        .filter((property) => hasValue(data[property]))
+        .forEach((property) => {
+          result[property] = this.process(data[property], request);
+        });
+      return result;
+
+    }
+  }
+
+  /**
+   * Some rest endpoints don't return a self link in their response. This method will fix that for
+   * the root resource in the response by filling in the requested href, without any embed params.
+   * It will print a warning in the console, as this could indicate an issue on the REST side.
+   *
+   * @param request   the {@RestRequest} that was sent to the server
+   * @param response  the {@link RawRestResponse} returned by the server
+   * @protected
+   */
+  protected ensureSelfLink(request: RestRequest, response: RawRestResponse): RawRestResponse {
+    const urlWithoutEmbedParams = getUrlWithoutEmbedParams(request.href);
+    if (request.method === RestRequestMethod.GET && hasValue(response) && hasValue(response.payload) && hasValue(response.payload._links)) {
+      if (hasNoValue(response.payload._links.self) || hasNoValue(response.payload._links.self.href)) {
+        console.warn(`The response for '${request.href}' doesn't have a self link. This could mean there's an issue with the REST endpoint`);
+        response.payload._links = Object.assign({}, response.payload._links, {
+          self: {
+            href: urlWithoutEmbedParams
+          }
+        })
+
+      } else {
+        const expected = splitUrlInParts(urlWithoutEmbedParams);
+        const actual = splitUrlInParts(response.payload._links.self.href);
+        if (expected[0] === actual[0] && (expected.some((e) => !actual.includes(e)) || actual.some((e) => !expected.includes(e)))) {
+          console.warn(`The response for '${urlWithoutEmbedParams}' has the self link '${response.payload._links.self.href}'. These don't match. This could mean there's an issue with the REST endpoint`);
+          response.payload._links = Object.assign({}, response.payload._links, {
+            self: {
+              href: urlWithoutEmbedParams
+            }
+          })
+        }
+      }
+    }
+    return response;
+  }
+
+  protected processPaginatedList<ObjectDomain>(data: any, request: RestRequest, alternativeURL?: string): PaginatedList<ObjectDomain> {
+    const pageInfo: PageInfo = this.processPageInfo(data);
+    let list = data._embedded;
+
+    // Workaround for inconsistency in rest response. Issue: https://github.com/DSpace/dspace-angular/issues/238
+    if (hasNoValue(list)) {
+      list = [];
+    } else if (!Array.isArray(list)) {
+      list = this.flattenSingleKeyObject(list);
+    }
+
+    const page: ObjectDomain[] = this.processArray(list, request);
+    const paginatedList = buildPaginatedList<ObjectDomain>(pageInfo, page, true, data._links);
+    this.addToObjectCache(paginatedList, request, data, alternativeURL);
+    return paginatedList;
+  }
+
+  protected processArray<ObjectDomain>(data: any, request: RestRequest): ObjectDomain[] {
+    let array: ObjectDomain[] = [];
+    data.forEach((datum) => {
+        array = [...array, this.process(datum, request)];
+      }
+    );
+    return array;
+  }
+
+  protected deserialize<ObjectDomain>(obj): any {
+    const type = obj.type;
+    const objConstructor = this.getConstructorFor<ObjectDomain>(type);
+    if (hasValue(objConstructor)) {
+      const serializer = new this.serializerConstructor(objConstructor);
+      return serializer.deserialize(obj);
+    } else {
+      console.warn('cannot deserialize type ' + type);
+      return null;
+    }
+  }
+
+  /**
+   * Returns the constructor for the given type, or null if there isn't a registered model for that
+   * type
+   *
+   * @param type the object to find the constructor for.
+   * @protected
+   */
+  protected getConstructorFor<ObjectDomain>(type: string): GenericConstructor<ObjectDomain> {
+    if (hasValue(type)) {
+      return getClassForType(type) as GenericConstructor<ObjectDomain>;
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Add the given object to the object cache
+   *
+   * @param co              the {@link CacheableObject} to add
+   * @param request         the {@link RestRequest} that was sent to the backend
+   * @param data            the (partial) response from the server
+   * @param alternativeURL  an alternative url that can be used to retrieve the object
+   */
+  addToObjectCache(co: CacheableObject, request: RestRequest, data: any, alternativeURL?: string): void {
+    if (!isCacheableObject(co)) {
+      const type = hasValue(data) && hasValue(data.type) ? data.type : 'object';
+      let dataJSON: string;
+      if (hasValue(data._embedded)) {
+        dataJSON = JSON.stringify(Object.assign({}, data, {
+          _embedded: '...'
+        }));
+      } else {
+        dataJSON = JSON.stringify(data);
+      }
+      console.warn(`Can't cache incomplete ${type}: ${JSON.stringify(co)}, parsed from (partial) response: ${dataJSON}`);
+      return;
+    }
+
+    if (alternativeURL === co._links.self.href) {
+      alternativeURL = undefined;
+    }
+
+    this.objectCache.add(co, hasValue(request.responseMsToLive) ? request.responseMsToLive : environment.cache.msToLive.default, request.uuid, alternativeURL);
+  }
+
+  processPageInfo(payload: any): PageInfo {
+    if (hasValue(payload.page)) {
+      const pageInfoObject = new DSpaceSerializer(PageInfo).deserialize(payload.page);
+      if (pageInfoObject.currentPage >= 0) {
+        Object.assign(pageInfoObject, { currentPage: pageInfoObject.currentPage + 1 });
+      }
+      return pageInfoObject;
+    } else {
+      return undefined;
+    }
+  }
+
+  protected flattenSingleKeyObject(obj: any): any {
+    const keys = Object.keys(obj);
+    if (keys.length !== 1) {
+      throw new Error(`Expected an object with a single key, got: ${JSON.stringify(obj)}`);
+    }
+    return obj[keys[0]];
+  }
+
+  protected isSuccessStatus(statusCode: number) {
+    return statusCode >= 200 && statusCode < 300;
+  }
+}
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/endpoint-map-response-parsing.service.ts b/src/app/core/data/endpoint-map-response-parsing.service.ts
index 5516e83c07a..eeb4e86facf 100644
--- a/src/app/core/data/endpoint-map-response-parsing.service.ts
+++ b/src/app/core/data/endpoint-map-response-parsing.service.ts
@@ -1,27 +1,115 @@
-import { Inject, Injectable } from '@angular/core';
-import { ErrorResponse, RestResponse, EndpointMapSuccessResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { ResponseParsingService } from './parsing.service';
+import {
+  DspaceRestResponseParsingService,
+  isCacheableObject
+} from './dspace-rest-response-parsing.service';
+import { hasValue } from '../../shared/empty.util';
+import { getClassForType } from '../cache/builders/build-decorators';
+import { GenericConstructor } from '../shared/generic-constructor';
 import { RestRequest } from './request.models';
-import { isNotEmpty } from '../../shared/empty.util';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { ParsedResponse } from '../cache/response.models';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { environment } from '../../../environments/environment';
 
-@Injectable()
-export class EndpointMapResponseParsingService implements ResponseParsingService {
+/**
+ * ResponseParsingService able to deal with HAL Endpoints that are only needed as steps
+ * on the way when discovering the path to a HAL Resource, and aren't properly typed.
+ *
+ * When all endpoints are properly typed, it can be removed.
+ */
+export class EndpointMapResponseParsingService extends DspaceRestResponseParsingService {
 
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links)) {
-      const links = data.payload._links;
-      for (const link of Object.keys(links)) {
-        links[link] = links[link].href;
+  /**
+   * Parse an endpoint map response.
+   *
+   * More lenient than DspaceRestResponseParsingService, in that it also allows objects we don't
+   * have a constructor for so their _links section can still be used to discover the path to a HAL
+   * resource.
+   *
+   * @param request   the request that was sent to the backend
+   * @param response  the response returned by the backend
+   */
+  parse(request: RestRequest, response: RawRestResponse): ParsedResponse {
+    try {
+      response = this.ensureSelfLink(request, response);
+      const processRequestDTO = this.process<DSpaceObject>(response.payload, request);
+
+      if (hasValue(processRequestDTO)) {
+        const type: string = processRequestDTO.type;
+        let objConstructor;
+        if (hasValue(type)) {
+          objConstructor = getClassForType(type);
+        }
+
+        if (isCacheableObject(processRequestDTO) && hasValue(objConstructor)) {
+          return new ParsedResponse(response.statusCode, processRequestDTO._links.self);
+        } else {
+          return new ParsedResponse(response.statusCode, undefined, processRequestDTO);
+        }
+      } else {
+        return new ParsedResponse(response.statusCode);
+      }
+    } catch (e) {
+      console.warn(`Couldn't parse endpoint request at ${request.href}`);
+      return new ParsedResponse(response.statusCode, undefined, {
+        _links: response.payload._links
+      });
+    }
+  }
+
+  /**
+   * Try to deserialize the object the way DspaceRestResponseParsingService does, but if
+   * it doesn't work, return the plain object stripped of its type, instead of throwing an error
+   *
+   * That way it can still be used to determine HAL links.
+   *
+   * @param obj the object to deserialize
+   * @protected
+   */
+  protected deserialize<ObjectDomain>(obj): any {
+    const type: string = obj.type;
+    if (hasValue(type)) {
+      const objConstructor = getClassForType(type) as GenericConstructor<ObjectDomain>;
+
+      if (hasValue(objConstructor)) {
+        const serializer = new this.serializerConstructor(objConstructor);
+        return serializer.deserialize(obj);
       }
-      return new EndpointMapSuccessResponse(links, data.statusCode, data.statusText);
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from root endpoint'),
-          { statusCode: data.statusCode, statusText: data.statusText }
-        )
-      );
     }
+    return obj;
   }
+
+  /**
+   * Add the given object to the object cache
+   *
+   * This differs from the version in DspaceRestResponseParsingService in that it has to take in
+   * to account deserialized objects that aren't properly typed. So it will only add objects to the
+   * cache if we can find a constructor for them
+   *
+   * @param co              the {@link CacheableObject} to add
+   * @param request         the {@link RestRequest} that was sent to the backend
+   * @param data            the (partial) response from the server
+   * @param alternativeURL  an alternative url that can be used to retrieve the object
+   */
+  addToObjectCache(co: CacheableObject, request: RestRequest, data: any, alternativeURL?: string): void {
+    if (!isCacheableObject(co)) {
+      const type = hasValue(data) && hasValue(data.type) ? data.type : 'object';
+      let dataJSON: string;
+      if (hasValue(data._embedded)) {
+        dataJSON = JSON.stringify(Object.assign({}, data, {
+          _embedded: '...'
+        }));
+      } else {
+        dataJSON = JSON.stringify(data);
+      }
+      console.warn(`Can't cache incomplete ${type}: ${JSON.stringify(co)}, parsed from (partial) response: ${dataJSON}`);
+      return;
+    }
+
+    if (hasValue(this.getConstructorFor<any>((co as any).type))) {
+      this.objectCache.add(co, hasValue(request.responseMsToLive) ? request.responseMsToLive : environment.cache.msToLive.default, request.uuid, alternativeURL);
+    }
+  }
+
 }
diff --git a/src/app/core/data/entity-type-data.service.ts b/src/app/core/data/entity-type-data.service.ts
index 87de69b9357..ee394a34acf 100644
--- a/src/app/core/data/entity-type-data.service.ts
+++ b/src/app/core/data/entity-type-data.service.ts
@@ -13,7 +13,7 @@ import { ItemType } from '../shared/item-relationships/item-type.model';
 import { ITEM_TYPE } from '../shared/item-relationships/item-type.resource-type';
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { FindListOptions } from './request.models';
 import { RequestService } from './request.service';
@@ -65,21 +65,25 @@ export class ItemTypeDataService {
   /**
    * Returns an observable of {@link RemoteData} of an {@link ItemType}, based on an href, with a list of {@link FollowLinkConfig},
    * to automatically resolve {@link HALLink}s of the {@link ItemType}
-   * @param href            The url of {@link ItemType} we want to retrieve
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @param href              The url of {@link ItemType} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  findByHref(href: string, ...linksToFollow: Array<FollowLinkConfig<ItemType>>): Observable<RemoteData<ItemType>> {
-    return this.dataService.findByHref(href, ...linksToFollow);
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<ItemType>>): Observable<RemoteData<ItemType>> {
+    return this.dataService.findByHref(href, reRequestOnStale, ...linksToFollow);
   }
 
   /**
    * Returns a list of observables of {@link RemoteData} of {@link ItemType}s, based on an href, with a list of {@link FollowLinkConfig},
    * to automatically resolve {@link HALLink}s of the {@link ItemType}
-   * @param href            The url of the {@link ItemType} we want to retrieve
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @param href              The url of the {@link ItemType} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  findByAllHref(href: string, findListOptions: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<ItemType>>): Observable<RemoteData<PaginatedList<ItemType>>> {
-    return this.dataService.findAllByHref(href, findListOptions, ...linksToFollow);
+  findByAllHref(href: string, reRequestOnStale = true, findListOptions: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<ItemType>>): Observable<RemoteData<PaginatedList<ItemType>>> {
+    return this.dataService.findAllByHref(href, findListOptions, reRequestOnStale, ...linksToFollow);
   }
 }
 /* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/entity-type.service.ts b/src/app/core/data/entity-type.service.ts
index b8e8b7cd9a3..f81adb32175 100644
--- a/src/app/core/data/entity-type.service.ts
+++ b/src/app/core/data/entity-type.service.ts
@@ -12,11 +12,12 @@ import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { Injectable } from '@angular/core';
 import { GetRequest } from './request.models';
 import { Observable } from 'rxjs/internal/Observable';
-import {switchMap, take, tap} from 'rxjs/operators';
+import {switchMap, take, map} from 'rxjs/operators';
 import { RemoteData } from './remote-data';
 import {RelationshipType} from '../shared/item-relationships/relationship-type.model';
-import {PaginatedList} from './paginated-list';
+import {PaginatedList} from './paginated-list.model';
 import {ItemType} from '../shared/item-relationships/item-type.model';
+import {getRemoteDataPayload, getFirstSucceededRemoteData} from '../shared/operators';
 
 /**
  * Service handling all ItemType requests
@@ -51,6 +52,20 @@ export class EntityTypeService extends DataService<ItemType> {
     );
   }
 
+  /**
+   * Check whether a given entity type is the left type of a given relationship type, as an observable boolean
+   * @param relationshipType  the relationship type for which to check whether the given entity type is the left type
+   * @param entityType  the entity type for which to check whether it is the left type of the given relationship type
+   */
+  isLeftType(relationshipType: RelationshipType, itemType: ItemType): Observable<boolean> {
+
+    return relationshipType.leftType.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((leftType) => leftType.uuid === itemType.uuid),
+    );
+  }
+
   /**
    * Get the allowed relationship types for an entity type
    * @param entityTypeId
@@ -73,30 +88,10 @@ export class EntityTypeService extends DataService<ItemType> {
    * @param label
    */
   getEntityTypeByLabel(label: string): Observable<RemoteData<ItemType>> {
-
-    // TODO: Remove mock data once REST API supports this
-    /*
-    href$.pipe(take(1)).subscribe((href) => {
-      const request = new GetRequest(this.requestService.generateRequestId(), href);
-      this.requestService.configure(request);
-    });
-
-    return this.rdbService.buildSingle<EntityType>(href$);
-    */
-
-    // Mock:
-    const index = [
-      'Publication',
-      'Person',
-      'Project',
-      'OrgUnit',
-      'Journal',
-      'JournalVolume',
-      'JournalIssue',
-      'DataPackage',
-      'DataFile',
-    ].indexOf(label);
-
-    return this.findById((index + 1) + '');
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      take(1),
+      switchMap((endPoint: string) =>
+        this.findByHref(endPoint + '/label/' + label))
+    );
   }
 }
diff --git a/src/app/core/data/eperson-registration.service.spec.ts b/src/app/core/data/eperson-registration.service.spec.ts
new file mode 100644
index 00000000000..d71a9da8498
--- /dev/null
+++ b/src/app/core/data/eperson-registration.service.spec.ts
@@ -0,0 +1,93 @@
+import { RequestService } from './request.service';
+import { EpersonRegistrationService } from './eperson-registration.service';
+import { RestResponse } from '../cache/response.models';
+import { RequestEntry } from './request.reducer';
+import { cold } from 'jasmine-marbles';
+import { PostRequest } from './request.models';
+import { Registration } from '../shared/registration.model';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+
+describe('EpersonRegistrationService', () => {
+  let service: EpersonRegistrationService;
+  let requestService: RequestService;
+
+  let halService: any;
+  let rdbService: any;
+
+  const registration = new Registration();
+  registration.email = 'test@mail.org';
+
+  const registrationWithUser = new Registration();
+  registrationWithUser.email = 'test@mail.org';
+  registrationWithUser.user = 'test-uuid';
+
+  let rd;
+
+  beforeEach(() => {
+    rd = createSuccessfulRemoteDataObject(registrationWithUser);
+    halService = new HALEndpointServiceStub('rest-url');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: 'request-id',
+      configure: {},
+      getByUUID: cold('a',
+        {a: Object.assign(new RequestEntry(), {response: new RestResponse(true, 200, 'Success')})})
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildFromRequestUUID: observableOf(rd)
+    });
+    service = new EpersonRegistrationService(
+      requestService,
+      rdbService,
+      halService
+    );
+  });
+
+  describe('getRegistrationEndpoint', () => {
+    it('should retrieve the registration endpoint', () => {
+      const expected = service.getRegistrationEndpoint();
+
+      expected.subscribe(((value) => {
+        expect(value).toEqual('rest-url/registrations');
+      }));
+    });
+  });
+
+  describe('getTokenSearchEndpoint', () => {
+    it('should return the token search endpoint for a specified token', () => {
+      const expected = service.getTokenSearchEndpoint('test-token');
+
+      expected.subscribe(((value) => {
+        expect(value).toEqual('rest-url/registrations/search/findByToken?token=test-token');
+      }));
+    });
+  });
+
+  describe('registerEmail', () => {
+    it('should send an email registration', () => {
+
+      const expected = service.registerEmail('test@mail.org');
+
+      expect(requestService.configure).toHaveBeenCalledWith(new PostRequest('request-id', 'rest-url/registrations', registration));
+      expect(expected).toBeObservable(cold('(a|)', {a: rd}));
+    });
+  });
+
+  describe('searchByToken', () => {
+    it('should return a registration corresponding to the provided token', () => {
+      const expected = service.searchByToken('test-token');
+
+      expect(expected).toBeObservable(cold('(a|)', {
+        a: Object.assign(new Registration(), {
+          email: registrationWithUser.email,
+          token: 'test-token',
+          user: registrationWithUser.user
+        })
+      }));
+
+    });
+  });
+
+});
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
new file mode 100644
index 00000000000..15bdced8d08
--- /dev/null
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -0,0 +1,110 @@
+import { Injectable } from '@angular/core';
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { GetRequest, PostRequest } from './request.models';
+import { Observable } from 'rxjs';
+import { filter, find, map, take } from 'rxjs/operators';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { Registration } from '../shared/registration.model';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../shared/operators';
+import { ResponseParsingService } from './parsing.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { RegistrationResponseParsingService } from './registration-response-parsing.service';
+import { RemoteData } from './remote-data';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+
+@Injectable(
+  {
+    providedIn: 'root',
+  }
+)
+/**
+ * Service that will register a new email address and request a token
+ */
+export class EpersonRegistrationService {
+
+  protected linkPath = 'registrations';
+  protected searchByTokenPath = '/search/findByToken?token=';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected halService: HALEndpointService,
+  ) {
+
+  }
+
+  /**
+   * Retrieves the Registration endpoint
+   */
+  getRegistrationEndpoint(): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Retrieves the endpoint to search by registration token
+   */
+  getTokenSearchEndpoint(token: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      map((href: string) => `${href}${this.searchByTokenPath}${token}`));
+  }
+
+  /**
+   * Register a new email address
+   * @param email
+   */
+  registerEmail(email: string): Observable<RemoteData<Registration>> {
+    const registration = new Registration();
+    registration.email = email;
+
+    const requestId = this.requestService.generateRequestId();
+
+    const hrefObs = this.getRegistrationEndpoint();
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PostRequest(requestId, href, registration);
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID<Registration>(requestId).pipe(
+      getFirstCompletedRemoteData()
+    );
+  }
+
+  /**
+   * Search a registration based on the provided token
+   * @param token
+   */
+  searchByToken(token: string): Observable<Registration> {
+    const requestId = this.requestService.generateRequestId();
+
+    const hrefObs = this.getTokenSearchEndpoint(token);
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new GetRequest(requestId, href);
+        Object.assign(request, {
+          getResponseParser(): GenericConstructor<ResponseParsingService> {
+            return RegistrationResponseParsingService;
+          }
+        });
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID<Registration>(requestId).pipe(
+      getFirstSucceededRemoteData(),
+      map((restResponse: RemoteData<Registration>) => {
+        return Object.assign(new Registration(), {email: restResponse.payload.email, token: token, user: restResponse.payload.user});
+      }),
+      take(1),
+    );
+
+  }
+
+}
diff --git a/src/app/core/data/external-source.service.ts b/src/app/core/data/external-source.service.ts
index 0c1a8d255c3..e264a467577 100644
--- a/src/app/core/data/external-source.service.ts
+++ b/src/app/core/data/external-source.service.ts
@@ -16,7 +16,7 @@ import { PaginatedSearchOptions } from '../../shared/search/paginated-search-opt
 import { hasValue, isNotEmptyOperator } from '../../shared/empty.util';
 import { configureRequest } from '../shared/operators';
 import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 
diff --git a/src/app/core/data/facet-config-response-parsing.service.ts b/src/app/core/data/facet-config-response-parsing.service.ts
index 0a552365f6f..4633edd8e28 100644
--- a/src/app/core/data/facet-config-response-parsing.service.ts
+++ b/src/app/core/data/facet-config-response-parsing.service.ts
@@ -1,25 +1,38 @@
 import { Injectable } from '@angular/core';
 import { SearchFilterConfig } from '../../shared/search/search-filter-config.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { FacetConfigSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
+import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { RestRequest } from './request.models';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
+import { FacetConfigResponse } from '../../shared/search/facet-config-response.model';
 
 @Injectable()
-export class FacetConfigResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-  toCache = false;
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) { super();
-  }
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+export class FacetConfigResponseParsingService extends DspaceRestResponseParsingService {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
 
     const config = data.payload._embedded.facets;
     const serializer = new DSpaceSerializer(SearchFilterConfig);
-    const facetConfig = serializer.deserializeArray(config);
-    return new FacetConfigSuccessResponse(facetConfig, data.statusCode, data.statusText);
+    const filters = serializer.deserializeArray(config);
+
+    const _links = {
+      self: data.payload._links.self
+    };
+
+    // fill in the missing links section
+    filters.forEach((filterConfig: SearchFilterConfig) => {
+      _links[filterConfig.name] = {
+        href: filterConfig._links.self.href
+      }
+    })
+
+    const facetConfigResponse = Object.assign(new FacetConfigResponse(), {
+      filters,
+      _links
+    });
+
+    this.addToObjectCache(facetConfigResponse, request, data);
+
+    return new ParsedResponse(data.statusCode, facetConfigResponse._links.self);
   }
 }
diff --git a/src/app/core/data/facet-value-map-response-parsing.service.ts b/src/app/core/data/facet-value-map-response-parsing.service.ts
deleted file mode 100644
index 7845e44e576..00000000000
--- a/src/app/core/data/facet-value-map-response-parsing.service.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Injectable } from '@angular/core';
-import { FacetValue } from '../../shared/search/facet-value.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { FacetValueMap, FacetValueMapSuccessResponse, FacetValueSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class FacetValueMapResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-  toCache = false;
-
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) { super();
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-
-    const payload = data.payload;
-    const facetMap: FacetValueMap = new FacetValueMap();
-
-    const serializer = new DSpaceSerializer(FacetValue);
-    payload._embedded.facets.map((facet) => {
-      const values = facet._embedded.values.map((value) => {value.search = value._links.search.href; return value;});
-      const facetValues = serializer.deserializeArray(values);
-      const valuesResponse = new FacetValueSuccessResponse(facetValues, data.statusCode, data.statusText, this.processPageInfo(data.payload));
-      facetMap[facet.name] = valuesResponse;
-    });
-
-    return new FacetValueMapSuccessResponse(facetMap, data.statusCode, data.statusText);
-  }
-}
diff --git a/src/app/core/data/facet-value-response-parsing.service.ts b/src/app/core/data/facet-value-response-parsing.service.ts
index b56bedd1bb2..6b9e8326850 100644
--- a/src/app/core/data/facet-value-response-parsing.service.ts
+++ b/src/app/core/data/facet-value-response-parsing.service.ts
@@ -1,27 +1,20 @@
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { FacetValue } from '../../shared/search/facet-value.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { FacetValueSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
+import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { RestRequest } from './request.models';
+import { FacetValues } from '../../shared/search/facet-values.model';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 
 @Injectable()
-export class FacetValueResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-  toCache = false;
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) { super();
-  }
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+export class FacetValueResponseParsingService extends DspaceRestResponseParsingService {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
     const payload = data.payload;
-
-    const serializer = new DSpaceSerializer(FacetValue);
-    // const values = payload._embedded.values.map((value) => {value.search = value._links.search.href; return value;});
-
-    const facetValues = serializer.deserializeArray(payload._embedded.values);
-    return new FacetValueSuccessResponse(facetValues, data.statusCode, data.statusText, this.processPageInfo(data.payload));
+    const facetValues = new DSpaceSerializer(FacetValues).deserialize(payload);
+    facetValues.pageInfo = this.processPageInfo(payload);
+    facetValues.page = new DSpaceSerializer(FacetValue).deserializeArray(payload._embedded.values);
+    this.addToObjectCache(facetValues, request, data);
+    return new ParsedResponse(data.statusCode, facetValues._links.self);
   }
 }
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
new file mode 100644
index 00000000000..47eb2498126
--- /dev/null
+++ b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
@@ -0,0 +1,187 @@
+import { AuthorizationDataService } from './authorization-data.service';
+import { SiteDataService } from '../site-data.service';
+import { AuthService } from '../../auth/auth.service';
+import { Site } from '../../shared/site.model';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { of as observableOf } from 'rxjs';
+import { FindListOptions } from '../request.models';
+import { FeatureID } from './feature-id';
+import { hasValue } from '../../../shared/empty.util';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { Authorization } from '../../shared/authorization.model';
+import { RemoteData } from '../remote-data';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { Feature } from '../../shared/feature.model';
+
+describe('AuthorizationDataService', () => {
+  let service: AuthorizationDataService;
+  let siteService: SiteDataService;
+  let authService: AuthService;
+
+  let site: Site;
+  let ePerson: EPerson;
+
+  function init() {
+    site = Object.assign(new Site(), {
+      id: 'test-site',
+      _links: {
+        self: { href: 'test-site-href' }
+      }
+    });
+    ePerson = Object.assign(new EPerson(), {
+      id: 'test-eperson',
+      uuid: 'test-eperson'
+    });
+    siteService = jasmine.createSpyObj('siteService', {
+      find: observableOf(site)
+    });
+    authService = {
+      isAuthenticated: () => observableOf(true),
+      getAuthenticatedUserFromStore: () => observableOf(ePerson)
+    } as AuthService;
+    service = new AuthorizationDataService(undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, authService, siteService);
+  }
+
+  beforeEach(() => {
+    init();
+    spyOn(service, 'searchBy').and.returnValue(observableOf(undefined));
+  });
+
+  describe('searchByObject', () => {
+    const objectUrl = 'fake-object-url';
+    const ePersonUuid = 'fake-eperson-uuid';
+
+    function createExpected(providedObjectUrl: string, providedEPersonUuid?: string, providedFeatureId?: FeatureID): FindListOptions {
+      const searchParams = [new RequestParam('uri', providedObjectUrl)];
+      if (hasValue(providedFeatureId)) {
+        searchParams.push(new RequestParam('feature', providedFeatureId));
+      }
+      if (hasValue(providedEPersonUuid)) {
+        searchParams.push(new RequestParam('eperson', providedEPersonUuid));
+      }
+      return Object.assign(new FindListOptions(), { searchParams });
+    }
+
+    describe('when no arguments are provided', () => {
+      beforeEach(() => {
+        service.searchByObject().subscribe();
+      });
+
+      it('should call searchBy with the site\'s url', () => {
+        expect(service.searchBy).toHaveBeenCalledWith('object', createExpected(site.self), true);
+      });
+    });
+
+    describe('when no arguments except for a feature are provided', () => {
+      beforeEach(() => {
+        service.searchByObject(FeatureID.LoginOnBehalfOf).subscribe();
+      });
+
+      it('should call searchBy with the site\'s url and the feature', () => {
+        expect(service.searchBy).toHaveBeenCalledWith('object', createExpected(site.self, null, FeatureID.LoginOnBehalfOf), true);
+      });
+    });
+
+    describe('when a feature and object url are provided', () => {
+      beforeEach(() => {
+        service.searchByObject(FeatureID.LoginOnBehalfOf, objectUrl).subscribe();
+      });
+
+      it('should call searchBy with the object\'s url and the feature', () => {
+        expect(service.searchBy).toHaveBeenCalledWith('object', createExpected(objectUrl, null, FeatureID.LoginOnBehalfOf), true);
+      });
+    });
+
+    describe('when all arguments are provided', () => {
+      beforeEach(() => {
+        service.searchByObject(FeatureID.LoginOnBehalfOf, objectUrl, ePersonUuid).subscribe();
+      });
+
+      it('should call searchBy with the object\'s url, user\'s uuid and the feature', () => {
+        expect(service.searchBy).toHaveBeenCalledWith('object', createExpected(objectUrl, ePersonUuid, FeatureID.LoginOnBehalfOf), true);
+      });
+    });
+  });
+
+  describe('isAuthorized', () => {
+    const featureID = FeatureID.AdministratorOf;
+    const validPayload = [
+      Object.assign(new Authorization(), {
+        feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
+          id: 'invalid-feature'
+        }))
+      }),
+      Object.assign(new Authorization(), {
+        feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
+          id: featureID
+        }))
+      })
+    ];
+    const invalidPayload = [
+      Object.assign(new Authorization(), {
+        feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
+          id: 'invalid-feature'
+        }))
+      }),
+      Object.assign(new Authorization(), {
+        feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
+          id: 'another-invalid-feature'
+        }))
+      })
+    ];
+    const emptyPayload = [];
+
+    describe('when searchByObject returns a 401', () => {
+      beforeEach(() => {
+        spyOn(service, 'searchByObject').and.returnValue(createFailedRemoteDataObject$('Unauthorized', 401));
+      });
+
+      it('should return false', (done) => {
+        service.isAuthorized(featureID).subscribe((result) => {
+          expect(result).toEqual(false);
+          done();
+        });
+      });
+    });
+
+    describe('when searchByObject returns an empty list', () => {
+      beforeEach(() => {
+        spyOn(service, 'searchByObject').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(emptyPayload)));
+      });
+
+      it('should return false', (done) => {
+        service.isAuthorized(featureID).subscribe((result) => {
+          expect(result).toEqual(false);
+          done();
+        });
+      });
+    });
+
+    describe('when searchByObject returns an invalid list', () => {
+      beforeEach(() => {
+        spyOn(service, 'searchByObject').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(invalidPayload)));
+      });
+
+      it('should return true', (done) => {
+        service.isAuthorized(featureID).subscribe((result) => {
+          expect(result).toEqual(false);
+          done();
+        });
+      });
+    });
+
+    describe('when searchByObject returns a valid list', () => {
+      beforeEach(() => {
+        spyOn(service, 'searchByObject').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(validPayload)));
+      });
+
+      it('should return true', (done) => {
+        service.isAuthorized(featureID).subscribe((result) => {
+          expect(result).toEqual(true);
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
new file mode 100644
index 00000000000..26b3e4edf31
--- /dev/null
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -0,0 +1,121 @@
+import { of as observableOf } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { AUTHORIZATION } from '../../shared/authorization.resource-type';
+import { dataService } from '../../cache/builders/build-decorators';
+import { DataService } from '../data.service';
+import { Authorization } from '../../shared/authorization.model';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DSOChangeAnalyzer } from '../dso-change-analyzer.service';
+import { AuthService } from '../../auth/auth.service';
+import { SiteDataService } from '../site-data.service';
+import { FindListOptions } from '../request.models';
+import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../remote-data';
+import { PaginatedList } from '../paginated-list.model';
+import { catchError, map, switchMap } from 'rxjs/operators';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { AuthorizationSearchParams } from './authorization-search-params';
+import { addSiteObjectUrlIfEmpty, oneAuthorizationMatchesFeature } from './authorization-utils';
+import { FeatureID } from './feature-id';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
+
+/**
+ * A service to retrieve {@link Authorization}s from the REST API
+ */
+@Injectable()
+@dataService(AUTHORIZATION)
+export class AuthorizationDataService extends DataService<Authorization> {
+  protected linkPath = 'authorizations';
+  protected searchByObjectPath = 'object';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DSOChangeAnalyzer<Authorization>,
+    protected authService: AuthService,
+    protected siteService: SiteDataService
+  ) {
+    super();
+  }
+
+  /**
+   * Checks if an {@link EPerson} (or anonymous) has access to a specific object within a {@link Feature}
+   * @param objectUrl     URL to the object to search {@link Authorization}s for.
+   *                      If not provided, the repository's {@link Site} will be used.
+   * @param ePersonUuid   UUID of the {@link EPerson} to search {@link Authorization}s for.
+   *                      If not provided, the UUID of the currently authenticated {@link EPerson} will be used.
+   * @param featureId     ID of the {@link Feature} to check {@link Authorization} for
+   */
+  isAuthorized(featureId?: FeatureID, objectUrl?: string, ePersonUuid?: string): Observable<boolean> {
+    return this.searchByObject(featureId, objectUrl, ePersonUuid, {}, followLink('feature')).pipe(
+      getFirstCompletedRemoteData(),
+      map((authorizationRD) => {
+        if (authorizationRD.statusCode !== 401 && hasValue(authorizationRD.payload) && isNotEmpty(authorizationRD.payload.page)) {
+          return authorizationRD.payload.page;
+        } else {
+          return [];
+        }
+      }),
+      catchError(() => observableOf(false)),
+      oneAuthorizationMatchesFeature(featureId)
+    );
+  }
+
+  /**
+   * Search for a list of {@link Authorization}s using the "object" search endpoint and providing optional object url,
+   * {@link EPerson} uuid and/or {@link Feature} id
+   * @param objectUrl     URL to the object to search {@link Authorization}s for.
+   *                      If not provided, the repository's {@link Site} will be used.
+   * @param ePersonUuid   UUID of the {@link EPerson} to search {@link Authorization}s for.
+   *                      If not provided, the UUID of the currently authenticated {@link EPerson} will be used.
+   * @param featureId     ID of the {@link Feature} to search {@link Authorization}s for
+   * @param options       {@link FindListOptions} to provide pagination and/or additional arguments
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  searchByObject(featureId?: FeatureID, objectUrl?: string, ePersonUuid?: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<Authorization>>): Observable<RemoteData<PaginatedList<Authorization>>> {
+    return observableOf(new AuthorizationSearchParams(objectUrl, ePersonUuid, featureId)).pipe(
+      addSiteObjectUrlIfEmpty(this.siteService),
+      switchMap((params: AuthorizationSearchParams) => {
+        return this.searchBy(this.searchByObjectPath, this.createSearchOptions(params.objectUrl, options, params.ePersonUuid, params.featureId), true, ...linksToFollow);
+      })
+    );
+  }
+
+  /**
+   * Create {@link FindListOptions} with {@link RequestParam}s containing a "uri", "feature" and/or "eperson" parameter
+   * @param objectUrl   Required parameter value to add to {@link RequestParam} "uri"
+   * @param options     Optional initial {@link FindListOptions} to add parameters to
+   * @param ePersonUuid Optional parameter value to add to {@link RequestParam} "eperson"
+   * @param featureId   Optional parameter value to add to {@link RequestParam} "feature"
+   */
+  private createSearchOptions(objectUrl: string, options: FindListOptions = {}, ePersonUuid?: string, featureId?: FeatureID): FindListOptions {
+    let params = [];
+    if (isNotEmpty(options.searchParams)) {
+      params = [...options.searchParams];
+    }
+    params.push(new RequestParam('uri', objectUrl))
+    if (hasValue(featureId)) {
+      params.push(new RequestParam('feature', featureId));
+    }
+    if (hasValue(ePersonUuid)) {
+      params.push(new RequestParam('eperson', ePersonUuid));
+    }
+    return Object.assign(new FindListOptions(), options, {
+      searchParams: [...params]
+    });
+  }
+}
diff --git a/src/app/core/data/feature-authorization/authorization-search-params.ts b/src/app/core/data/feature-authorization/authorization-search-params.ts
new file mode 100644
index 00000000000..3c281804fb2
--- /dev/null
+++ b/src/app/core/data/feature-authorization/authorization-search-params.ts
@@ -0,0 +1,16 @@
+import { FeatureID } from './feature-id';
+
+/**
+ * Search parameters for retrieving authorizations from the REST API
+ */
+export class AuthorizationSearchParams {
+  objectUrl: string;
+  ePersonUuid: string;
+  featureId: FeatureID;
+
+  constructor(objectUrl?: string, ePersonUuid?: string, featureId?: FeatureID) {
+    this.objectUrl = objectUrl;
+    this.ePersonUuid = ePersonUuid;
+    this.featureId = featureId;
+  }
+}
diff --git a/src/app/core/data/feature-authorization/authorization-utils.ts b/src/app/core/data/feature-authorization/authorization-utils.ts
new file mode 100644
index 00000000000..f04a237d729
--- /dev/null
+++ b/src/app/core/data/feature-authorization/authorization-utils.ts
@@ -0,0 +1,84 @@
+import { map, switchMap } from 'rxjs/operators';
+import { Observable } from 'rxjs/internal/Observable';
+import { AuthorizationSearchParams } from './authorization-search-params';
+import { SiteDataService } from '../site-data.service';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { of as observableOf, combineLatest as observableCombineLatest } from 'rxjs';
+import { AuthService } from '../../auth/auth.service';
+import { Authorization } from '../../shared/authorization.model';
+import { Feature } from '../../shared/feature.model';
+import { FeatureID } from './feature-id';
+import { getFirstSucceededRemoteDataPayload } from '../../shared/operators';
+
+/**
+ * Operator accepting {@link AuthorizationSearchParams} and adding the current {@link Site}'s selflink to the parameter's
+ * objectUrl property, if this property is empty
+ * @param siteService The {@link SiteDataService} used for retrieving the repository's {@link Site}
+ */
+export const addSiteObjectUrlIfEmpty = (siteService: SiteDataService) =>
+  (source: Observable<AuthorizationSearchParams>): Observable<AuthorizationSearchParams> =>
+    source.pipe(
+      switchMap((params: AuthorizationSearchParams) => {
+        if (hasNoValue(params.objectUrl)) {
+          return siteService.find().pipe(
+            map((site) => Object.assign({}, params, { objectUrl: site.self }))
+          );
+        } else {
+          return observableOf(params);
+        }
+      })
+    );
+
+/**
+ * Operator accepting {@link AuthorizationSearchParams} and adding the authenticated user's uuid to the parameter's
+ * ePersonUuid property, if this property is empty and an {@link EPerson} is currently authenticated
+ * @param authService The {@link AuthService} used for retrieving the currently authenticated {@link EPerson}
+ */
+export const addAuthenticatedUserUuidIfEmpty = (authService: AuthService) =>
+  (source: Observable<AuthorizationSearchParams>): Observable<AuthorizationSearchParams> =>
+    source.pipe(
+      switchMap((params: AuthorizationSearchParams) => {
+        if (hasNoValue(params.ePersonUuid)) {
+          return authService.isAuthenticated().pipe(
+            switchMap((authenticated) => {
+              if (authenticated) {
+                return authService.getAuthenticatedUserFromStore().pipe(
+                  map((ePerson) => Object.assign({}, params, { ePersonUuid: ePerson.uuid }))
+                );
+              } else {
+                return observableOf(params)
+              }
+            })
+          );
+        } else {
+          return observableOf(params);
+        }
+      })
+    );
+
+/**
+ * Operator checking if at least one of the provided {@link Authorization}s contains a {@link Feature} that matches the
+ * provided {@link FeatureID}
+ * Note: This expects the {@link Authorization}s to contain a resolved link to their {@link Feature}. If they don't,
+ * this observable will always emit false.
+ * @param featureID
+ * @returns true if at least one {@link Feature} matches, false if none do
+ */
+export const oneAuthorizationMatchesFeature = (featureID: FeatureID) =>
+  (source: Observable<Authorization[]>): Observable<boolean> =>
+    source.pipe(
+      switchMap((authorizations: Authorization[]) => {
+        if (isNotEmpty(authorizations)) {
+          return observableCombineLatest(
+            ...authorizations
+              .filter((authorization: Authorization) => hasValue(authorization.feature))
+              .map((authorization: Authorization) => authorization.feature.pipe(
+                getFirstSucceededRemoteDataPayload()
+              ))
+          );
+        } else {
+          return observableOf([]);
+        }
+      }),
+      map((features: Feature[]) => features.filter((feature: Feature) => feature.id === featureID).length > 0)
+    );
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.spec.ts
new file mode 100644
index 00000000000..d08fdec39f8
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.spec.ts
@@ -0,0 +1,69 @@
+import { AuthorizationDataService } from '../authorization-data.service';
+import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+import { RemoteData } from '../../remote-data';
+import { of as observableOf } from 'rxjs';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { DsoPageFeatureGuard } from './dso-page-feature.guard';
+import { FeatureID } from '../feature-id';
+import { Observable } from 'rxjs/internal/Observable';
+import { AuthService } from '../../../auth/auth.service';
+
+/**
+ * Test implementation of abstract class DsoPageAdministratorGuard
+ */
+class DsoPageFeatureGuardImpl extends DsoPageFeatureGuard<any> {
+  constructor(protected resolver: Resolve<RemoteData<any>>,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService,
+              protected featureID: FeatureID) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(this.featureID);
+  }
+}
+
+describe('DsoPageAdministratorGuard', () => {
+  let guard: DsoPageFeatureGuard<any>;
+  let authorizationService: AuthorizationDataService;
+  let router: Router;
+  let authService: AuthService;
+  let resolver: Resolve<RemoteData<any>>;
+  let object: DSpaceObject;
+
+  function init() {
+    object = {
+      self: 'test-selflink'
+    } as DSpaceObject;
+
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    router = jasmine.createSpyObj('router', {
+      parseUrl: {}
+    });
+    resolver = jasmine.createSpyObj('resolver', {
+      resolve: createSuccessfulRemoteDataObject$(object)
+    });
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true)
+    });
+    guard = new DsoPageFeatureGuardImpl(resolver, authorizationService, router, authService, undefined);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('getObjectUrl', () => {
+    it('should return the resolved object\'s selflink', (done) => {
+      guard.getObjectUrl(undefined, undefined).subscribe((selflink) => {
+        expect(selflink).toEqual(object.self);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.ts
new file mode 100644
index 00000000000..0c40b6f0168
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.ts
@@ -0,0 +1,32 @@
+import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+import { RemoteData } from '../../remote-data';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { getAllSucceededRemoteDataPayload } from '../../../shared/operators';
+import { map } from 'rxjs/operators';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { FeatureAuthorizationGuard } from './feature-authorization.guard';
+import { AuthService } from '../../../auth/auth.service';
+
+/**
+ * Abstract Guard for preventing unauthorized access to {@link DSpaceObject} pages that require rights for a specific feature
+ * This guard utilizes a resolver to retrieve the relevant object to check authorizations for
+ */
+export abstract class DsoPageFeatureGuard<T extends DSpaceObject> extends FeatureAuthorizationGuard {
+  constructor(protected resolver: Resolve<RemoteData<T>>,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(authorizationService, router, authService);
+  }
+
+  /**
+   * Check authorization rights for the object resolved using the provided resolver
+   */
+  getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
+    return (this.resolver.resolve(route, state) as Observable<RemoteData<T>>).pipe(
+      getAllSucceededRemoteDataPayload(),
+      map((dso) => dso.self)
+    );
+  }
+}
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.spec.ts
new file mode 100644
index 00000000000..1bfc8ffa2e6
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.spec.ts
@@ -0,0 +1,73 @@
+import { FeatureAuthorizationGuard } from './feature-authorization.guard';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { of as observableOf } from 'rxjs';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { AuthService } from '../../../auth/auth.service';
+
+/**
+ * Test implementation of abstract class FeatureAuthorizationGuard
+ * Provide the return values of the overwritten getters as constructor arguments
+ */
+class FeatureAuthorizationGuardImpl extends FeatureAuthorizationGuard {
+  constructor(protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService,
+              protected featureId: FeatureID,
+              protected objectUrl: string,
+              protected ePersonUuid: string) {
+    super(authorizationService, router, authService);
+  }
+
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(this.featureId);
+  }
+
+  getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
+    return observableOf(this.objectUrl);
+  }
+
+  getEPersonUuid(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
+    return observableOf(this.ePersonUuid);
+  }
+}
+
+describe('FeatureAuthorizationGuard', () => {
+  let guard: FeatureAuthorizationGuard;
+  let authorizationService: AuthorizationDataService;
+  let router: Router;
+  let authService: AuthService;
+
+  let featureId: FeatureID;
+  let objectUrl: string;
+  let ePersonUuid: string;
+
+  function init() {
+    featureId = FeatureID.LoginOnBehalfOf;
+    objectUrl = 'fake-object-url';
+    ePersonUuid = 'fake-eperson-uuid';
+
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    router = jasmine.createSpyObj('router', {
+      parseUrl: {}
+    });
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true)
+    });
+    guard = new FeatureAuthorizationGuardImpl(authorizationService, router, authService, featureId, objectUrl, ePersonUuid);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('canActivate', () => {
+    it('should call authorizationService.isAuthenticated with the appropriate arguments', () => {
+      guard.canActivate(undefined, { url: 'current-url' } as any).subscribe();
+      expect(authorizationService.isAuthorized).toHaveBeenCalledWith(featureId, objectUrl, ePersonUuid);
+    });
+  });
+});
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.ts
new file mode 100644
index 00000000000..851c4127d81
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.ts
@@ -0,0 +1,59 @@
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree
+} from '@angular/router';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { Observable } from 'rxjs/internal/Observable';
+import { returnForbiddenUrlTreeOrLoginOnFalse } from '../../../shared/operators';
+import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+import { AuthService } from '../../../auth/auth.service';
+
+/**
+ * Abstract Guard for preventing unauthorized activating and loading of routes when a user
+ * doesn't have authorized rights on a specific feature and/or object.
+ * Override the desired getters in the parent class for checking specific authorization on a feature and/or object.
+ */
+export abstract class FeatureAuthorizationGuard implements CanActivate {
+  constructor(protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+  }
+
+  /**
+   * True when user has authorization rights for the feature and object provided
+   * Redirect the user to the unauthorized page when he/she's not authorized for the given feature
+   */
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
+    return observableCombineLatest(this.getFeatureID(route, state), this.getObjectUrl(route, state), this.getEPersonUuid(route, state)).pipe(
+      switchMap(([featureID, objectUrl, ePersonUuid]) => this.authorizationService.isAuthorized(featureID, objectUrl, ePersonUuid)),
+      returnForbiddenUrlTreeOrLoginOnFalse(this.router, this.authService, state.url)
+    );
+  }
+
+  /**
+   * The type of feature to check authorization for
+   * Override this method to define a feature
+   */
+  abstract getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID>;
+
+  /**
+   * The URL of the object to check if the user has authorized rights for
+   * Override this method to define an object URL. If not provided, the {@link Site}'s URL will be used
+   */
+  getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
+    return observableOf(undefined);
+  }
+
+  /**
+   * The UUID of the user to check authorization rights for
+   * Override this method to define an {@link EPerson} UUID. If not provided, the authenticated user's UUID will be used.
+   */
+  getEPersonUuid(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
+    return observableOf(undefined);
+  }
+}
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
new file mode 100644
index 00000000000..41b4f06b541
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+import { FeatureAuthorizationGuard } from './feature-authorization.guard';
+import { FeatureID } from '../feature-id';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
+import { AuthService } from '../../../auth/auth.service';
+
+/**
+ * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have administrator
+ * rights to the {@link Site}
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class SiteAdministratorGuard extends FeatureAuthorizationGuard {
+  constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
+    super(authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
new file mode 100644
index 00000000000..147e0617cac
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
@@ -0,0 +1,28 @@
+import { FeatureAuthorizationGuard } from './feature-authorization.guard';
+import { Injectable } from '@angular/core';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { FeatureID } from '../feature-id';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../../auth/auth.service';
+
+/**
+ * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have registration
+ * rights to the {@link Site}
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class SiteRegisterGuard extends FeatureAuthorizationGuard {
+  constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
+    super(authorizationService, router, authService);
+  }
+
+  /**
+   * Check registration authorization rights
+   */
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.EPersonRegistration);
+  }
+}
diff --git a/src/app/core/data/feature-authorization/feature-data.service.ts b/src/app/core/data/feature-authorization/feature-data.service.ts
new file mode 100644
index 00000000000..12be6f84524
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-data.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import { FEATURE } from '../../shared/feature.resource-type';
+import { dataService } from '../../cache/builders/build-decorators';
+import { DataService } from '../data.service';
+import { Feature } from '../../shared/feature.model';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DSOChangeAnalyzer } from '../dso-change-analyzer.service';
+
+/**
+ * A service to retrieve {@link Feature}s from the REST API
+ */
+@Injectable()
+@dataService(FEATURE)
+export class FeatureDataService extends DataService<Feature> {
+  protected linkPath = 'features';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DSOChangeAnalyzer<Feature>
+  ) {
+    super();
+  }
+}
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts
new file mode 100644
index 00000000000..3c17f43cb1d
--- /dev/null
+++ b/src/app/core/data/feature-authorization/feature-id.ts
@@ -0,0 +1,12 @@
+/**
+ * Enum object for all possible {@link Feature} IDs
+ */
+export enum FeatureID {
+  LoginOnBehalfOf = 'loginOnBehalfOf',
+  AdministratorOf = 'administratorOf',
+  CanDelete = 'canDelete',
+  CanEditMetadata = 'canEditMetadata',
+  WithdrawItem = 'withdrawItem',
+  ReinstateItem = 'reinstateItem',
+  EPersonRegistration = 'epersonRegistration',
+}
diff --git a/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts b/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
index 1934afba277..73f81aeccdf 100644
--- a/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
+++ b/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
@@ -3,7 +3,7 @@ import { getMockObjectCacheService } from '../../shared/mocks/object-cache.servi
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from './parsing.service';
 import { GetRequest } from './request.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { FilteredDiscoveryQueryResponse } from '../cache/response.models';
 
 describe('FilteredDiscoveryPageResponseParsingService', () => {
@@ -26,7 +26,7 @@ describe('FilteredDiscoveryPageResponseParsingService', () => {
       },
       statusCode: 200,
       statusText: 'OK'
-    } as DSpaceRESTV2Response;
+    } as RawRestResponse;
 
     it('should return a FilteredDiscoveryQueryResponse containing the correct query', () => {
       const response = service.parse(request, mockResponse);
diff --git a/src/app/core/data/filtered-discovery-page-response-parsing.service.ts b/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
index 02ce102ca61..244e6f0f8b5 100644
--- a/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
+++ b/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
@@ -1,13 +1,13 @@
 import { Inject, Injectable } from '@angular/core';
 import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { FilteredDiscoveryQueryResponse, RestResponse } from '../cache/response.models';
 
 /**
- * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to a discovery query (string)
+ * A ResponseParsingService used to parse RawRestResponse coming from the REST API to a discovery query (string)
  * wrapped in a FilteredDiscoveryQueryResponse
  */
 @Injectable()
@@ -22,10 +22,10 @@ export class FilteredDiscoveryPageResponseParsingService extends BaseResponsePar
   /**
    * Parses data from the REST API to a discovery query wrapped in a FilteredDiscoveryQueryResponse
    * @param {RestRequest} request
-   * @param {DSpaceRESTV2Response} data
+   * @param {RawRestResponse} data
    * @returns {RestResponse}
    */
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+  parse(request: RestRequest, data: RawRestResponse): RestResponse {
     const query = data.payload['discovery-query'];
     return new FilteredDiscoveryQueryResponse(query, data.statusCode, data.statusText);
   }
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index 282a43ec614..5b7278632a9 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
 import { cold, getTestScheduler } from 'jasmine-marbles';
-import { Observable, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -10,11 +10,11 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core.reducers';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemDataService } from './item-data.service';
-import { DeleteRequest, FindListOptions, PostRequest, RestRequest } from './request.models';
+import { DeleteRequest, FindListOptions, PostRequest } from './request.models';
 import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
@@ -24,9 +24,6 @@ describe('ItemDataService', () => {
     generateRequestId(): string {
       return scopeID;
     },
-    configure(request: RestRequest) {
-      // Do nothing
-    },
     getByHref(requestHref: string) {
       const responseCacheEntry = new RequestEntry();
       responseCacheEntry.response = new RestResponse(true, 200, 'OK');
@@ -36,17 +33,15 @@ describe('ItemDataService', () => {
       // Do nothing
     }
   }) as RequestService;
-  const rdbService = jasmine.createSpyObj('rdbService', {
-    toRemoteDataObservable: observableOf({})
-  });
+  const rdbService = getMockRemoteDataBuildService();
+
+  const itemEndpoint = 'https://rest.api/core/items';
 
   const store = {} as Store<CoreState>;
   const objectCache = {} as ObjectCacheService;
-  const halEndpointService = {
-    getEndpoint(linkPath: string): Observable<string> {
-      return cold('a', { a: itemEndpoint });
-    }
-  } as HALEndpointService;
+  const halEndpointService = jasmine.createSpyObj('halService', {
+    getEndpoint: observableOf(itemEndpoint)
+  });
   const bundleService = jasmine.createSpyObj('bundleService', {
     findByHref: {}
   });
@@ -68,7 +63,6 @@ describe('ItemDataService', () => {
   const notificationsService = {} as NotificationsService;
   const http = {} as HttpClient;
   const comparator = {} as any;
-  const itemEndpoint = 'https://rest.api/core/items';
   const ScopedItemEndpoint = `https://rest.api/core/items/${scopeID}`;
 
   function initMockBrowseService(isSuccessful: boolean) {
@@ -124,56 +118,11 @@ describe('ItemDataService', () => {
     });
   });
 
-  describe('getItemWithdrawEndpoint', () => {
-    beforeEach(() => {
-      scheduler = getTestScheduler();
-      service = initTestService();
-
-    });
-
-    it('should return the endpoint to withdraw and reinstate items', () => {
-      const result = service.getItemWithdrawEndpoint(scopeID);
-      const expected = cold('a', { a: ScopedItemEndpoint });
-
-      expect(result).toBeObservable(expected);
-    });
-
-    it('should setWithDrawn', () => {
-      const expected = new RestResponse(true, 200, 'OK');
-      const result = service.setWithDrawn(scopeID, true);
-      result.subscribe((v) => expect(v).toEqual(expected));
-
-    });
-  });
-
-  describe('getItemDiscoverableEndpoint', () => {
-    beforeEach(() => {
-      scheduler = getTestScheduler();
-      service = initTestService();
-
-    });
-
-    it('should return the endpoint to make an item private or public', () => {
-      const result = service.getItemDiscoverableEndpoint(scopeID);
-      const expected = cold('a', { a: ScopedItemEndpoint });
-
-      expect(result).toBeObservable(expected);
-    });
-
-    it('should setDiscoverable', () => {
-      const expected = new RestResponse(true, 200, 'OK');
-      const result = service.setDiscoverable(scopeID, false);
-      result.subscribe((v) => expect(v).toEqual(expected));
-
-    });
-  });
-
   describe('removeMappingFromCollection', () => {
     let result;
 
     beforeEach(() => {
       service = initTestService();
-      spyOn(requestService, 'configure');
       result = service.removeMappingFromCollection('item-id', 'collection-id');
     });
 
@@ -187,7 +136,6 @@ describe('ItemDataService', () => {
 
     beforeEach(() => {
       service = initTestService();
-      spyOn(requestService, 'configure');
       result = service.mapToCollection('item-id', 'collection-href');
     });
 
@@ -207,12 +155,14 @@ describe('ItemDataService', () => {
 
     beforeEach(() => {
       service = initTestService();
-      spyOn(requestService, 'configure');
       result = service.importExternalSourceEntry(externalSourceEntry, 'collection-id');
     });
 
-    it('should configure a POST request', () => {
-      result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest)));
+    it('should configure a POST request', (done) => {
+      result.subscribe(() => {
+        expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest));
+        done();
+      });
     });
   });
 
@@ -223,12 +173,14 @@ describe('ItemDataService', () => {
 
     beforeEach(() => {
       service = initTestService();
-      spyOn(requestService, 'configure');
       result = service.createBundle(itemId, bundleName);
     });
 
-    it('should configure a POST request', () => {
-      result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest)));
+    it('should configure a POST request', (done) => {
+      result.subscribe(() => {
+        expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest));
+        done();
+      });
     });
   });
 
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 562050c802b..09e60392707 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -9,42 +9,35 @@ import { BrowseService } from '../browse/browse.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { GenericSuccessResponse, RestResponse } from '../cache/response.models';
 import { CoreState } from '../core.reducers';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Collection } from '../shared/collection.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { ITEM } from '../shared/item.resource-type';
-import {
-  configureRequest,
-  filterSuccessfulResponses,
-  getRequestFromRequestHref, getRequestFromRequestUUID,
-  getResponseFromEntry
-} from '../shared/operators';
+import { configureRequest } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
 
 import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import {
   DeleteRequest,
   FindListOptions,
   GetRequest,
-  MappedCollectionsRequest,
-  PatchRequest,
   PostRequest,
   PutRequest,
   RestRequest
 } from './request.models';
-import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 import { Bundle } from '../shared/bundle.model';
 import { MetadataMap } from '../shared/metadata.models';
 import { BundleDataService } from './bundle-data.service';
+import { Operation } from 'fast-json-patch';
+import { NoContent } from '../shared/NoContent.model';
 
 @Injectable()
 @dataService(ITEM)
@@ -55,7 +48,7 @@ export class ItemDataService extends DataService<Item> {
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected store: Store<CoreState>,
-    private bs: BrowseService,
+    protected bs: BrowseService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
@@ -101,14 +94,13 @@ export class ItemDataService extends DataService<Item> {
    * @param itemId        The item's id
    * @param collectionId  The collection's id
    */
-  public removeMappingFromCollection(itemId: string, collectionId: string): Observable<RestResponse> {
+  public removeMappingFromCollection(itemId: string, collectionId: string): Observable<RemoteData<NoContent>> {
     return this.getMappedCollectionsEndpoint(itemId, collectionId).pipe(
       isNotEmptyOperator(),
       distinctUntilChanged(),
       map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)),
       configureRequest(this.requestService),
-      switchMap((request: RestRequest) => this.requestService.getByUUID(request.uuid)),
-      getResponseFromEntry()
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)),
     );
   }
 
@@ -117,7 +109,7 @@ export class ItemDataService extends DataService<Item> {
    * @param itemId          The item's id
    * @param collectionHref  The collection's self link
    */
-  public mapToCollection(itemId: string, collectionHref: string): Observable<RestResponse> {
+  public mapToCollection(itemId: string, collectionHref: string): Observable<RemoteData<NoContent>> {
     return this.getMappedCollectionsEndpoint(itemId).pipe(
       isNotEmptyOperator(),
       distinctUntilChanged(),
@@ -129,8 +121,7 @@ export class ItemDataService extends DataService<Item> {
         return new PostRequest(this.requestService.generateRequestId(), endpointURL, collectionHref, options);
       }),
       configureRequest(this.requestService),
-      switchMap((request: RestRequest) => this.requestService.getByUUID(request.uuid)),
-      getResponseFromEntry()
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid))
     );
   }
 
@@ -139,90 +130,47 @@ export class ItemDataService extends DataService<Item> {
    * @param itemId    The item's id
    */
   public getMappedCollections(itemId: string): Observable<RemoteData<PaginatedList<Collection>>> {
-    const request$ = this.getMappedCollectionsEndpoint(itemId).pipe(
+    const href$ = this.getMappedCollectionsEndpoint(itemId).pipe(
       isNotEmptyOperator(),
-      distinctUntilChanged(),
-      map((endpointURL: string) => new MappedCollectionsRequest(this.requestService.generateRequestId(), endpointURL)),
-      configureRequest(this.requestService)
+      take(1)
     );
 
-    const requestEntry$ = request$.pipe(
-      switchMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-    const payload$ = requestEntry$.pipe(
-      filterSuccessfulResponses(),
-      map((response: GenericSuccessResponse<PaginatedList<Collection>>) => response.payload)
-    );
+    href$.subscribe((href: string) => {
+      const request = new GetRequest(this.requestService.generateRequestId(), href);
+      this.requestService.configure(request);
+    });
 
-    return this.rdbService.toRemoteDataObservable(requestEntry$, payload$);
-  }
-
-  /**
-   * Get the endpoint for item withdrawal and reinstatement
-   * @param itemId
-   */
-  public getItemWithdrawEndpoint(itemId: string): Observable<string> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, itemId))
-    );
-  }
-
-  /**
-   * Get the endpoint to make item private and public
-   * @param itemId
-   */
-  public getItemDiscoverableEndpoint(itemId: string): Observable<string> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getIDHref(endpoint, itemId))
-    );
+    return this.rdbService.buildList(href$);
   }
 
   /**
    * Set the isWithdrawn state of an item to a specified state
-   * @param itemId
+   * @param item
    * @param withdrawn
    */
-  public setWithDrawn(itemId: string, withdrawn: boolean) {
-    const patchOperation = [{
+  public setWithDrawn(item: Item, withdrawn: boolean): Observable<RemoteData<Item>> {
+
+    const patchOperation = {
       op: 'replace', path: '/withdrawn', value: withdrawn
-    }];
+    } as Operation;
     this.requestService.removeByHrefSubstring('/discover');
 
-    return this.getItemWithdrawEndpoint(itemId).pipe(
-      distinctUntilChanged(),
-      map((endpointURL: string) =>
-        new PatchRequest(this.requestService.generateRequestId(), endpointURL, patchOperation)
-      ),
-      configureRequest(this.requestService),
-      map((request: RestRequest) => request.uuid),
-      getRequestFromRequestUUID(this.requestService),
-      filter((requestEntry: RequestEntry) => requestEntry.completed),
-      map((requestEntry: RequestEntry) => requestEntry.response)
-    );
+    return this.patch(item, [patchOperation]);
   }
 
   /**
    * Set the isDiscoverable state of an item to a specified state
-   * @param itemId
+   * @param item
    * @param discoverable
    */
-  public setDiscoverable(itemId: string, discoverable: boolean) {
-    const patchOperation = [{
+  public setDiscoverable(item: Item, discoverable: boolean): Observable<RemoteData<Item>> {
+    const patchOperation = {
       op: 'replace', path: '/discoverable', value: discoverable
-    }];
+    } as Operation;
     this.requestService.removeByHrefSubstring('/discover');
 
-    return this.getItemDiscoverableEndpoint(itemId).pipe(
-      distinctUntilChanged(),
-      map((endpointURL: string) =>
-        new PatchRequest(this.requestService.generateRequestId(), endpointURL, patchOperation)
-      ),
-      configureRequest(this.requestService),
-      map((request: RestRequest) => request.uuid),
-      getRequestFromRequestUUID(this.requestService),
-      filter((requestEntry: RequestEntry) => requestEntry.completed),
-      map((requestEntry: RequestEntry) => requestEntry.response)
-    );
+    return this.patch(item, [patchOperation]);
+;
   }
 
   /**
@@ -280,19 +228,7 @@ export class ItemDataService extends DataService<Item> {
       this.requestService.configure(request);
     });
 
-    const selfLink$ = this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: any) => {
-        if (isNotEmpty(response.resourceSelfLinks)) {
-          return response.resourceSelfLinks[0];
-        }
-      }),
-      distinctUntilChanged()
-    ) as Observable<string>;
-
-    return selfLink$.pipe(
-      switchMap((selfLink: string) => this.bundleService.findByHref(selfLink)),
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -311,7 +247,7 @@ export class ItemDataService extends DataService<Item> {
    * @param itemId
    * @param collection
    */
-  public moveToCollection(itemId: string, collection: Collection): Observable<RestResponse> {
+  public moveToCollection(itemId: string, collection: Collection): Observable<RemoteData<Collection>> {
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'text/uri-list');
@@ -328,10 +264,7 @@ export class ItemDataService extends DataService<Item> {
       })
     ).subscribe();
 
-    return this.requestService.getByUUID(requestId).pipe(
-      find((request: RequestEntry) => request.completed),
-      map((request: RequestEntry) => request.response)
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -356,16 +289,7 @@ export class ItemDataService extends DataService<Item> {
       })
     ).subscribe();
 
-    return this.requestService.getByUUID(requestId).pipe(
-      find((request: RequestEntry) => request.completed),
-      getResponseFromEntry(),
-      map((response: any) => {
-        if (isNotEmpty(response.resourceSelfLinks)) {
-          return response.resourceSelfLinks[0];
-        }
-      }),
-      switchMap((selfLink: string) => this.findByHref(selfLink))
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
diff --git a/src/app/core/data/item-template-data.service.spec.ts b/src/app/core/data/item-template-data.service.spec.ts
new file mode 100644
index 00000000000..f7a32b4f827
--- /dev/null
+++ b/src/app/core/data/item-template-data.service.spec.ts
@@ -0,0 +1,139 @@
+import { ItemTemplateDataService } from './item-template-data.service';
+import { RestRequest } from './request.models';
+import { RequestEntry } from './request.reducer';
+import { RestResponse } from '../cache/response.models';
+import { RequestService } from './request.service';
+import { of as observableOf } from 'rxjs';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { BrowseService } from '../browse/browse.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { cold } from 'jasmine-marbles';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { CollectionDataService } from './collection-data.service';
+import { RestRequestMethod } from './rest-request-method';
+import { Item } from '../shared/item.model';
+
+describe('ItemTemplateDataService', () => {
+  let service: ItemTemplateDataService;
+  let itemService: any;
+
+  const item = new Item();
+  const collectionEndpoint = 'https://rest.api/core/collections/4af28e99-6a9c-4036-a199-e1b587046d39';
+  const itemEndpoint = `${collectionEndpoint}/itemtemplate`;
+  const scopeID = '4af28e99-6a9c-4036-a199-e1b587046d39';
+  const requestService = {
+    generateRequestId(): string {
+      return scopeID;
+    },
+    configure(request: RestRequest) {
+      // Do nothing
+    },
+    getByHref(requestHref: string) {
+      const responseCacheEntry = new RequestEntry();
+      responseCacheEntry.response = new RestResponse(true, 200, 'OK');
+      return observableOf(responseCacheEntry);
+    },
+    getByUUID(uuid: string) {
+      const responseCacheEntry = new RequestEntry();
+      responseCacheEntry.response = new RestResponse(true, 200, 'OK');
+      return observableOf(responseCacheEntry);
+    },
+    commit(method?: RestRequestMethod) {
+      // Do nothing
+    }
+  } as RequestService;
+  const rdbService = {} as RemoteDataBuildService;
+  const store = {} as Store<CoreState>;
+  const bs = {} as BrowseService;
+  const objectCache = {
+    getObjectBySelfLink(self) {
+      return observableOf({})
+    },
+    addPatch(self, operations) {
+      // Do nothing
+    }
+  } as any;
+  const halEndpointService = {
+    getEndpoint(linkPath: string): Observable<string> {
+      return cold('a', {a: itemEndpoint});
+    }
+  } as HALEndpointService;
+  const notificationsService = {} as NotificationsService;
+  const http = {} as HttpClient;
+  const comparator = {
+    diff(first, second) {
+      return [{}];
+    }
+  } as any;
+  const collectionService = {
+    getIDHrefObs(id): Observable<string> {
+      return observableOf(collectionEndpoint);
+    }
+  } as CollectionDataService;
+
+  function initTestService() {
+    service = new ItemTemplateDataService(
+      requestService,
+      rdbService,
+      store,
+      bs,
+      objectCache,
+      halEndpointService,
+      notificationsService,
+      http,
+      comparator,
+      undefined,
+      collectionService
+    );
+    itemService = (service as any).dataService;
+  }
+
+  beforeEach(() => {
+    initTestService();
+  });
+
+  describe('commitUpdates', () => {
+    it('should call commitUpdates on the item service implementation', () => {
+      spyOn(itemService, 'commitUpdates');
+      service.commitUpdates();
+      expect(itemService.commitUpdates).toHaveBeenCalled();
+    });
+  });
+
+  describe('update', () => {
+    it('should call update on the item service implementation', () => {
+      spyOn(itemService, 'update');
+      service.update(item);
+      expect(itemService.update).toHaveBeenCalled();
+    });
+  });
+
+  describe('findByCollectionID', () => {
+    it('should call findByCollectionID on the item service implementation', () => {
+      spyOn(itemService, 'findByCollectionID');
+      service.findByCollectionID(scopeID);
+      expect(itemService.findByCollectionID).toHaveBeenCalled();
+    });
+  });
+
+  describe('create', () => {
+    it('should call createTemplate on the item service implementation', () => {
+      spyOn(itemService, 'createTemplate');
+      service.create(item, scopeID);
+      expect(itemService.createTemplate).toHaveBeenCalled();
+    });
+  });
+
+  describe('deleteByCollectionID', () => {
+    it('should call deleteByCollectionID on the item service implementation', () => {
+      spyOn(itemService, 'deleteByCollectionID');
+      service.deleteByCollectionID(item, scopeID);
+      expect(itemService.deleteByCollectionID).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/core/data/item-template-data.service.ts b/src/app/core/data/item-template-data.service.ts
new file mode 100644
index 00000000000..93a67aa46fa
--- /dev/null
+++ b/src/app/core/data/item-template-data.service.ts
@@ -0,0 +1,207 @@
+import { Injectable } from '@angular/core';
+import { ItemDataService } from './item-data.service';
+import { UpdateDataService } from './update-data.service';
+import { Item } from '../shared/item.model';
+import { RestRequestMethod } from './rest-request-method';
+import { RemoteData } from './remote-data';
+import { Observable } from 'rxjs/internal/Observable';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { BrowseService } from '../browse/browse.service';
+import { CollectionDataService } from './collection-data.service';
+import { switchMap, map } from 'rxjs/operators';
+import { BundleDataService } from './bundle-data.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { NoContent } from '../shared/NoContent.model';
+import { hasValue } from '../../shared/empty.util';
+import { Operation } from 'fast-json-patch';
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * A custom implementation of the ItemDataService, but for collection item templates
+ * Makes sure to change the endpoint before sending out CRUD requests for the item template
+ */
+class DataServiceImpl extends ItemDataService {
+  protected collectionLinkPath = 'itemtemplate';
+  protected linkPath = 'itemtemplates';
+
+  /**
+   * Endpoint dynamically changing depending on what request we're sending
+   */
+  private endpoint$: Observable<string>;
+
+  /**
+   * Is the current endpoint based on a collection?
+   */
+  private collectionEndpoint = false;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected bs: BrowseService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DSOChangeAnalyzer<Item>,
+    protected bundleService: BundleDataService,
+    protected collectionService: CollectionDataService) {
+    super(requestService, rdbService, store, bs, objectCache, halService, notificationsService, http, comparator, bundleService);
+  }
+
+  /**
+   * Set the endpoint to be based on a collection
+   * @param collectionID  The ID of the collection to base the endpoint on
+   */
+  private setCollectionEndpoint(collectionID: string) {
+    this.collectionEndpoint = true;
+    this.endpoint$ = this.collectionService.getIDHrefObs(collectionID).pipe(
+      switchMap((href: string) => this.halService.getEndpoint(this.collectionLinkPath, href))
+    );
+  }
+
+  /**
+   * Set the endpoint to the regular linkPath
+   */
+  private setRegularEndpoint() {
+    this.collectionEndpoint = false;
+    this.endpoint$ = this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Get the base endpoint for all requests
+   * Uses the current collectionID to assemble a request endpoint for the collection's item template
+   */
+  protected getEndpoint(): Observable<string> {
+    return this.endpoint$;
+  }
+
+  /**
+   * If the current endpoint is based on a collection, simply return the collection's template endpoint, otherwise
+   * create a regular template endpoint
+   * @param resourceID
+   */
+  getIDHrefObs(resourceID: string): Observable<string> {
+    if (this.collectionEndpoint) {
+      return this.getEndpoint();
+    } else {
+      return super.getIDHrefObs(resourceID);
+    }
+  }
+
+  /**
+   * Set the collection ID and send a find by ID request
+   * @param collectionID
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findByCollectionID(collectionID: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Item>>): Observable<RemoteData<Item>> {
+    this.setCollectionEndpoint(collectionID);
+    return super.findById(collectionID, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Set the collection ID and send a create request
+   * @param item
+   * @param collectionID
+   */
+  createTemplate(item: Item, collectionID: string): Observable<RemoteData<Item>> {
+    this.setCollectionEndpoint(collectionID);
+    return super.create(item);
+  }
+
+  /**
+   * Set the collection ID and send a delete request
+   * @param item
+   * @param collectionID
+   */
+  deleteByCollectionID(item: Item, collectionID: string): Observable<boolean> {
+    this.setRegularEndpoint();
+    return super.delete(item.uuid).pipe(
+      map((response: RemoteData<NoContent>) => hasValue(response) && response.hasSucceeded)
+    );
+  }
+}
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on a collection's itemtemplates endpoint
+ */
+@Injectable()
+export class ItemTemplateDataService implements UpdateDataService<Item> {
+  /**
+   * The data service responsible for all CRUD actions on the item
+   */
+  private dataService: DataServiceImpl;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected bs: BrowseService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DSOChangeAnalyzer<Item>,
+    protected bundleService: BundleDataService,
+    protected collectionService: CollectionDataService) {
+    this.dataService = new DataServiceImpl(requestService, rdbService, store, bs, objectCache, halService, notificationsService, http, comparator, bundleService, collectionService);
+  }
+
+  /**
+   * Commit current object changes to the server
+   */
+  commitUpdates(method?: RestRequestMethod) {
+    this.dataService.commitUpdates(method);
+  }
+
+  /**
+   * Add a new patch to the object cache
+   */
+  update(object: Item): Observable<RemoteData<Item>> {
+    return this.dataService.update(object);
+  }
+
+  patch(dso: Item, operations: Operation[]): Observable<RemoteData<Item>> {
+    return this.dataService.patch(dso, operations);
+  }
+
+  /**
+   * Find an item template by collection ID
+   * @param collectionID
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findByCollectionID(collectionID: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Item>>): Observable<RemoteData<Item>> {
+    return this.dataService.findByCollectionID(collectionID, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Create a new item template for a collection by ID
+   * @param item
+   * @param collectionID
+   */
+  create(item: Item, collectionID: string): Observable<RemoteData<Item>> {
+    return this.dataService.createTemplate(item, collectionID);
+  }
+
+  /**
+   * Delete a template item by collection ID
+   * @param item
+   * @param collectionID
+   */
+  deleteByCollectionID(item: Item, collectionID: string): Observable<boolean> {
+    return this.dataService.deleteByCollectionID(item, collectionID);
+  }
+}
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/license-data.service.ts b/src/app/core/data/license-data.service.ts
index 23637be5968..13ceaab6934 100644
--- a/src/app/core/data/license-data.service.ts
+++ b/src/app/core/data/license-data.service.ts
@@ -13,7 +13,7 @@ import { License } from '../shared/license.model';
 import { LICENSE } from '../shared/license.resource-type';
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { FindListOptions } from './request.models';
 import { RequestService } from './request.service';
@@ -65,21 +65,25 @@ export class LicenseDataService {
   /**
    * Returns an observable of {@link RemoteData} of a {@link License}, based on an href, with a list of {@link FollowLinkConfig},
    * to automatically resolve {@link HALLink}s of the {@link License}
-   * @param href            The URL of object we want to retrieve
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @param href              The URL of object we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  findByHref(href: string, ...linksToFollow: Array<FollowLinkConfig<License>>): Observable<RemoteData<License>> {
-    return this.dataService.findByHref(href, ...linksToFollow);
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<License>>): Observable<RemoteData<License>> {
+    return this.dataService.findByHref(href, reRequestOnStale, ...linksToFollow);
   }
 
   /**
    * Returns a list of observables of {@link RemoteData} of {@link License}s, based on an href, with a list of {@link FollowLinkConfig},
    * to automatically resolve {@link HALLink}s of the {@link License}
-   * @param href            The URL of object we want to retrieve
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @param href              The URL of object we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  findByAllHref(href: string, findListOptions: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<License>>): Observable<RemoteData<PaginatedList<License>>> {
-    return this.dataService.findAllByHref(href, findListOptions, ...linksToFollow);
+  findByAllHref(href: string, reRequestOnStale = true, findListOptions: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<License>>): Observable<RemoteData<PaginatedList<License>>> {
+    return this.dataService.findAllByHref(href, findListOptions, reRequestOnStale, ...linksToFollow);
   }
 }
 /* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts
index ffeb6f9128b..81464e5cb12 100644
--- a/src/app/core/data/lookup-relation.service.spec.ts
+++ b/src/app/core/data/lookup-relation.service.spec.ts
@@ -3,7 +3,7 @@ import { ExternalSourceService } from './external-source.service';
 import { SearchService } from '../shared/search/search.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { PaginatedList } from './paginated-list';
+import { buildPaginatedList } from './paginated-list.model';
 import { PageInfo } from '../shared/page-info.model';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
@@ -43,7 +43,7 @@ describe('LookupRelationService', () => {
 
   function init() {
     externalSourceService = jasmine.createSpyObj('externalSourceService', {
-      getExternalSourceEntries: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: totalExternal, totalPages: totalExternal, currentPage: 1 }), [{}]))
+      getExternalSourceEntries: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: totalExternal, totalPages: totalExternal, currentPage: 1 }), [{}]))
     });
     searchService = jasmine.createSpyObj('searchService', {
       search: createSuccessfulRemoteDataObject$(createPaginatedList(localResults)),
diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts
index 395976cbc39..49b3d47c6b9 100644
--- a/src/app/core/data/lookup-relation.service.ts
+++ b/src/app/core/data/lookup-relation.service.ts
@@ -1,10 +1,10 @@
 import { ExternalSourceService } from './external-source.service';
 import { SearchService } from '../shared/search/search.service';
-import { concat, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
+import { concat, distinctUntilChanged, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 import { ReplaySubject } from 'rxjs/internal/ReplaySubject';
 import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { SearchResult } from '../../shared/search/search-result.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
@@ -63,6 +63,7 @@ export class LookupRelationService {
           concat(subject.pipe(take(1)))
         )
       ) as any
+      ,
     ) as Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
   }
 
@@ -90,7 +91,8 @@ export class LookupRelationService {
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
       map((results: PaginatedList<ExternalSourceEntry>) => results.totalElements),
-      startWith(0)
+      startWith(0),
+      distinctUntilChanged()
     );
   }
 
diff --git a/src/app/core/data/mapped-collections-reponse-parsing.service.ts b/src/app/core/data/mapped-collections-reponse-parsing.service.ts
deleted file mode 100644
index bf8ed036e38..00000000000
--- a/src/app/core/data/mapped-collections-reponse-parsing.service.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { PaginatedList } from './paginated-list';
-import { PageInfo } from '../shared/page-info.model';
-import { ErrorResponse, GenericSuccessResponse, RestResponse } from '../cache/response.models';
-
-@Injectable()
-/**
- * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to a GenericSuccessResponse
- * containing a PaginatedList of mapped collections
- */
-export class MappedCollectionsReponseParsingService implements ResponseParsingService {
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    if (payload._embedded && payload._embedded.mappedCollections) {
-      const mappedCollections = payload._embedded.mappedCollections;
-      // TODO: When the API supports it, change this to fetch a paginated list, instead of creating static one
-      // Reason: Pagination is currently not supported on the mappedCollections endpoint
-      const paginatedMappedCollections = new PaginatedList(Object.assign(new PageInfo(), {
-        elementsPerPage: mappedCollections.length,
-        totalElements: mappedCollections.length,
-        totalPages: 1,
-        currentPage: 1
-      }), mappedCollections);
-      return new GenericSuccessResponse(paginatedMappedCollections, data.statusCode, data.statusText);
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from mappedCollections endpoint'), data
-        )
-      );
-    }
-  }
-}
diff --git a/src/app/core/data/metadata-field-data.service.spec.ts b/src/app/core/data/metadata-field-data.service.spec.ts
new file mode 100644
index 00000000000..b2e293936e5
--- /dev/null
+++ b/src/app/core/data/metadata-field-data.service.spec.ts
@@ -0,0 +1,74 @@
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { FindListOptions } from './request.models';
+import { MetadataFieldDataService } from './metadata-field-data.service';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RequestParam } from '../cache/models/request-param.model';
+
+describe('MetadataFieldDataService', () => {
+  let metadataFieldService: MetadataFieldDataService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let schema: MetadataSchema;
+  let rdbService: RemoteDataBuildService;
+
+  const endpoint = 'api/metadatafield/endpoint';
+
+  function init() {
+    schema = Object.assign(new MetadataSchema(), {
+      prefix: 'dc',
+      namespace: 'namespace',
+      _links: {
+        self: { href: 'selflink' }
+      }
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
+      configure: {},
+      getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
+      removeByHrefSubstring: {}
+    });
+    halService = Object.assign(new HALEndpointServiceStub(endpoint));
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      error: {}
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$(undefined)
+    });
+    metadataFieldService = new MetadataFieldDataService(requestService, rdbService, undefined, halService, undefined, undefined, undefined, notificationsService);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('findBySchema', () => {
+    beforeEach(() => {
+      spyOn(metadataFieldService, 'searchBy');
+    });
+
+    it('should call searchBy with the correct arguments', () => {
+      metadataFieldService.findBySchema(schema);
+      const expectedOptions = Object.assign(new FindListOptions(), {
+        searchParams: [new RequestParam('schema', schema.prefix)]
+      });
+      expect(metadataFieldService.searchBy).toHaveBeenCalledWith('bySchema', expectedOptions, true);
+    });
+  });
+
+  describe('clearRequests', () => {
+    it('should remove requests on the data service\'s endpoint', (done) => {
+      metadataFieldService.clearRequests().subscribe(() => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(`${endpoint}/${(metadataFieldService as any).linkPath}`);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
new file mode 100644
index 00000000000..38ce1815645
--- /dev/null
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -0,0 +1,112 @@
+import { Injectable } from '@angular/core';
+import { hasValue } from '../../shared/empty.util';
+import { dataService } from '../cache/builders/build-decorators';
+import { DataService } from './data.service';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { HttpClient } from '@angular/common/http';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { FindListOptions } from './request.models';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { tap } from 'rxjs/operators';
+import { RequestParam } from '../cache/models/request-param.model';
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the metadatafields endpoint
+ */
+@Injectable()
+@dataService(METADATA_FIELD)
+export class MetadataFieldDataService extends DataService<MetadataField> {
+  protected linkPath = 'metadatafields';
+  protected searchBySchemaLinkPath = 'bySchema';
+  protected searchByFieldNameLinkPath = 'byFieldName';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected halService: HALEndpointService,
+    protected objectCache: ObjectCacheService,
+    protected comparator: DefaultChangeAnalyzer<MetadataField>,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService) {
+    super();
+  }
+
+  /**
+   * Find metadata fields belonging to a metadata schema
+   * @param schema            The metadata schema to list fields for
+   * @param options           The options info used to retrieve the fields
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findBySchema(schema: MetadataSchema, options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<MetadataField>>) {
+    const optionsWithSchema = Object.assign(new FindListOptions(), options, {
+      searchParams: [new RequestParam('schema', schema.prefix)]
+    });
+    return this.searchBy(this.searchBySchemaLinkPath, optionsWithSchema, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Find metadata fields with either the partial metadata field name (e.g. "dc.ti") as query or an exact match to
+   * at least the schema, element or qualifier
+   * @param schema    optional; an exact match of the prefix of the metadata schema (e.g. "dc", "dcterms", "eperson")
+   * @param element   optional; an exact match of the field's element (e.g. "contributor", "title")
+   * @param qualifier optional; an exact match of the field's qualifier (e.g. "author", "alternative")
+   * @param query     optional (if any of schema, element or qualifier used) - part of the fully qualified field,
+   * should start with the start of the schema, element or qualifier (e.g. “dc.ti”, “contributor”, “auth”, “contributor.ot”)
+   * @param exactName optional; the exact fully qualified field, should use the syntax schema.element.qualifier or
+   * schema.element if no qualifier exists (e.g. "dc.title", "dc.contributor.author"). It will only return one value
+   * if there's an exact match
+   * @param options   The options info used to retrieve the fields
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after the response becomes stale
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  searchByFieldNameParams(schema: string, element: string, qualifier: string, query: string, exactName: string, options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<MetadataField>>): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    const optionParams = Object.assign(new FindListOptions(), options, {
+      searchParams: [
+        new RequestParam('schema', hasValue(schema) ? schema : ''),
+        new RequestParam('element', hasValue(element) ? element : ''),
+        new RequestParam('qualifier', hasValue(qualifier) ? qualifier : ''),
+        new RequestParam('query', hasValue(query) ? query : ''),
+        new RequestParam('exactName', hasValue(exactName) ? exactName : '')
+      ]
+    });
+    return this.searchBy(this.searchByFieldNameLinkPath, optionParams, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Finds a specific metadata field by name.
+   * @param exactFieldName  The exact fully qualified field, should use the syntax schema.element.qualifier or
+   * schema.element if no qualifier exists (e.g. "dc.title", "dc.contributor.author"). It will only return one value
+   * if there's an exact match, empty list if there is no exact match.
+   */
+  findByExactFieldName(exactFieldName: string): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return this.searchByFieldNameParams(null, null, null, null, exactFieldName, null);
+  }
+
+  /**
+   * Clear all metadata field requests
+   * Used for refreshing lists after adding/updating/removing a metadata field from a metadata schema
+   */
+  clearRequests(): Observable<string> {
+    return this.getBrowseEndpoint().pipe(
+      tap((href: string) => {
+        this.requestService.removeByHrefSubstring(href);
+      })
+    );
+  }
+
+}
diff --git a/src/app/core/data/metadata-schema-data.service.spec.ts b/src/app/core/data/metadata-schema-data.service.spec.ts
new file mode 100644
index 00000000000..f8c972bc049
--- /dev/null
+++ b/src/app/core/data/metadata-schema-data.service.spec.ts
@@ -0,0 +1,87 @@
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { MetadataSchemaDataService } from './metadata-schema-data.service';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { CreateRequest, PutRequest } from './request.models';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+
+describe('MetadataSchemaDataService', () => {
+  let metadataSchemaService: MetadataSchemaDataService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let rdbService: RemoteDataBuildService;
+
+  const endpoint = 'api/metadataschema/endpoint';
+
+  function init() {
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
+      configure: {},
+      getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
+      removeByHrefSubstring: {}
+    });
+    halService = Object.assign(new HALEndpointServiceStub(endpoint));
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      error: {}
+    });
+    rdbService = getMockRemoteDataBuildService();
+    metadataSchemaService = new MetadataSchemaDataService(requestService, rdbService, undefined, halService, undefined, undefined, undefined, notificationsService);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('createOrUpdateMetadataSchema', () => {
+    let schema: MetadataSchema;
+
+    beforeEach(() => {
+      schema = Object.assign(new MetadataSchema(), {
+        prefix: 'dc',
+        namespace: 'namespace',
+        _links: {
+          self: { href: 'selflink' }
+        }
+      });
+    });
+
+    describe('called with a new metadata schema', () => {
+      it('should send a CreateRequest', (done) => {
+        metadataSchemaService.createOrUpdateMetadataSchema(schema).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(CreateRequest));
+          done();
+        });
+      });
+    });
+
+    describe('called with an existing metadata schema', () => {
+      beforeEach(() => {
+        schema = Object.assign(schema, {
+          id: 'id-of-existing-schema'
+        });
+      });
+
+      it('should send a PutRequest', (done) => {
+        metadataSchemaService.createOrUpdateMetadataSchema(schema).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PutRequest));
+          done();
+        });
+      });
+    });
+  });
+
+  describe('clearRequests', () => {
+    it('should remove requests on the data service\'s endpoint', (done) => {
+      metadataSchemaService.clearRequests().subscribe(() => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(`${endpoint}/${(metadataSchemaService as any).linkPath}`);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index 915f5883799..99a3f98b8ed 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -9,37 +9,21 @@ import { CoreState } from '../core.reducers';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { METADATA_SCHEMA } from '../metadata/metadata-schema.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ChangeAnalyzer } from './change-analyzer';
-
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { RequestService } from './request.service';
-
-/* tslint:disable:max-classes-per-file */
-class DataServiceImpl extends DataService<MetadataSchema> {
-  protected linkPath = 'metadataschemas';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: ChangeAnalyzer<MetadataSchema>) {
-    super();
-  }
-
-}
+import { Observable } from 'rxjs/internal/Observable';
+import { hasValue } from '../../shared/empty.util';
+import { tap } from 'rxjs/operators';
+import { RemoteData } from './remote-data';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
  */
 @Injectable()
 @dataService(METADATA_SCHEMA)
-export class MetadataSchemaDataService {
-  private dataService: DataServiceImpl;
+export class MetadataSchemaDataService extends DataService<MetadataSchema> {
+  protected linkPath = 'metadataschemas';
 
   constructor(
     protected requestService: RequestService,
@@ -50,6 +34,35 @@ export class MetadataSchemaDataService {
     protected comparator: DefaultChangeAnalyzer<MetadataSchema>,
     protected http: HttpClient,
     protected notificationsService: NotificationsService) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+    super();
   }
+
+  /**
+   * Create or Update a MetadataSchema
+   *  If the MetadataSchema contains an id, it is assumed the schema already exists and is updated instead
+   *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
+   *  - On creation, a CreateRequest is used
+   *  - On update, a PutRequest is used
+   * @param schema    The MetadataSchema to create or update
+   */
+  createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<RemoteData<MetadataSchema>> {
+    const isUpdate = hasValue(schema.id);
+
+    if (isUpdate) {
+      return this.put(schema);
+    } else {
+      return this.create(schema);
+    }
+  }
+
+  /**
+   * Clear all metadata schema requests
+   * Used for refreshing lists after adding/updating/removing a metadata schema in the registry
+   */
+  clearRequests(): Observable<string> {
+    return this.getBrowseEndpoint().pipe(
+      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+    );
+  }
+
 }
diff --git a/src/app/core/data/metadatafield-parsing.service.ts b/src/app/core/data/metadatafield-parsing.service.ts
deleted file mode 100644
index 08f7892ac75..00000000000
--- a/src/app/core/data/metadatafield-parsing.service.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MetadatafieldSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-/**
- * A service responsible for parsing DSpaceRESTV2Response data related to a single MetadataField to a valid RestResponse
- */
-@Injectable()
-export class MetadatafieldParsingService implements ResponseParsingService {
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    const deserialized = new DSpaceSerializer(MetadataField).deserialize(payload);
-    return new MetadatafieldSuccessResponse(deserialized, data.statusCode, data.statusText);
-  }
-
-}
diff --git a/src/app/core/data/metadataschema-parsing.service.ts b/src/app/core/data/metadataschema-parsing.service.ts
deleted file mode 100644
index f4b90e5dcde..00000000000
--- a/src/app/core/data/metadataschema-parsing.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MetadataschemaSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class MetadataschemaParsingService implements ResponseParsingService {
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    const deserialized = new DSpaceSerializer(MetadataSchema).deserialize(payload);
-    return new MetadataschemaSuccessResponse(deserialized, data.statusCode, data.statusText);
-  }
-
-}
diff --git a/src/app/core/data/mydspace-response-parsing.service.ts b/src/app/core/data/mydspace-response-parsing.service.ts
index 062bafab46a..ee20b154a54 100644
--- a/src/app/core/data/mydspace-response-parsing.service.ts
+++ b/src/app/core/data/mydspace-response-parsing.service.ts
@@ -1,20 +1,16 @@
 import { Injectable } from '@angular/core';
-import { RestResponse, SearchSuccessResponse } from '../cache/response.models';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
+import { ParsedResponse } from '../cache/response.models';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { RestRequest } from './request.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { hasValue } from '../../shared/empty.util';
-import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
+import { SearchObjects } from '../../shared/search/search-objects.model';
 import { MetadataMap, MetadataValue } from '../shared/metadata.models';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 
 @Injectable()
-export class MyDSpaceResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingService {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
     // fallback for unexpected empty response
     const emptyPayload = {
       _embedded: {
@@ -41,12 +37,8 @@ export class MyDSpaceResponseParsingService implements ResponseParsingService {
     const dsoSelfLinks = payload._embedded.objects
       .filter((object) => hasValue(object._embedded))
       .map((object) => object._embedded.indexableObject)
-      .map((dso) => this.dsoParser.parse(request, {
-        payload: dso,
-        statusCode: data.statusCode,
-        statusText: data.statusText
-      }))
-      .map((obj) => obj.resourceSelfLinks)
+      .map((dso) => this.process(dso, request))
+      .map((obj) => obj._links.self.href)
       .reduce((combined, thisElement) => [...combined, ...thisElement], []);
 
     const objects = payload._embedded.objects
@@ -57,8 +49,10 @@ export class MyDSpaceResponseParsingService implements ResponseParsingService {
         _embedded: this.filterEmbeddedObjects(object)
       }));
     payload.objects = objects;
-    const deserialized = new DSpaceSerializer(SearchQueryResponse).deserialize(payload);
-    return new SearchSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(payload));
+    const deserialized = new DSpaceSerializer(SearchObjects).deserialize(payload);
+    deserialized.pageInfo = this.processPageInfo(payload)
+    this.addToObjectCache(deserialized, request, data);
+    return new ParsedResponse(data.statusCode, deserialized._links.self);
   }
 
   protected filterEmbeddedObjects(object) {
diff --git a/src/app/core/data/object-updates/object-updates.actions.ts b/src/app/core/data/object-updates/object-updates.actions.ts
index 94918157eec..13bbabb2866 100644
--- a/src/app/core/data/object-updates/object-updates.actions.ts
+++ b/src/app/core/data/object-updates/object-updates.actions.ts
@@ -2,13 +2,14 @@ import {type} from '../../../shared/ngrx/type';
 import {Action} from '@ngrx/store';
 import {Identifiable} from './object-updates.reducer';
 import {INotification} from '../../../shared/notifications/models/notification.model';
+import { PatchOperationService } from './patch-operation-service/patch-operation.service';
+import { GenericConstructor } from '../../shared/generic-constructor';
 
 /**
  * The list of ObjectUpdatesAction type definitions
  */
 export const ObjectUpdatesActionTypes = {
   INITIALIZE_FIELDS: type('dspace/core/cache/object-updates/INITIALIZE_FIELDS'),
-  ADD_PAGE_TO_CUSTOM_ORDER: type('dspace/core/cache/object-updates/ADD_PAGE_TO_CUSTOM_ORDER'),
   SET_EDITABLE_FIELD: type('dspace/core/cache/object-updates/SET_EDITABLE_FIELD'),
   SET_VALID_FIELD: type('dspace/core/cache/object-updates/SET_VALID_FIELD'),
   ADD_FIELD: type('dspace/core/cache/object-updates/ADD_FIELD'),
@@ -17,8 +18,7 @@ export const ObjectUpdatesActionTypes = {
   REINSTATE: type('dspace/core/cache/object-updates/REINSTATE'),
   REMOVE: type('dspace/core/cache/object-updates/REMOVE'),
   REMOVE_ALL: type('dspace/core/cache/object-updates/REMOVE_ALL'),
-  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD'),
-  MOVE: type('dspace/core/cache/object-updates/MOVE'),
+  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD')
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -29,8 +29,7 @@ export const ObjectUpdatesActionTypes = {
 export enum FieldChangeType {
   UPDATE = 0,
   ADD = 1,
-  REMOVE = 2,
-  MOVE = 3
+  REMOVE = 2
 }
 
 /**
@@ -42,9 +41,7 @@ export class InitializeFieldsAction implements Action {
     url: string,
     fields: Identifiable[],
     lastModified: Date,
-    order: string[],
-    pageSize: number,
-    page: number
+    patchOperationService?: GenericConstructor<PatchOperationService>
   };
 
   /**
@@ -54,49 +51,15 @@ export class InitializeFieldsAction implements Action {
    *    the unique url of the page for which the fields are being initialized
    * @param fields The identifiable fields of which the updates are kept track of
    * @param lastModified The last modified date of the object that belongs to the page
-   * @param order A custom order to keep track of objects moving around
-   * @param pageSize The page size used to fill empty pages for the custom order
-   * @param page The first page to populate in the custom order
+   * @param patchOperationService A {@link PatchOperationService} used for creating a patch
    */
   constructor(
     url: string,
     fields: Identifiable[],
     lastModified: Date,
-    order: string[] = [],
-    pageSize: number = 9999,
-    page: number = 0
+    patchOperationService?: GenericConstructor<PatchOperationService>
   ) {
-    this.payload = { url, fields, lastModified, order, pageSize, page };
-  }
-}
-
-/**
- * An ngrx action to initialize a new page's fields in the ObjectUpdates state
- */
-export class AddPageToCustomOrderAction implements Action {
-  type = ObjectUpdatesActionTypes.ADD_PAGE_TO_CUSTOM_ORDER;
-  payload: {
-    url: string,
-    fields: Identifiable[],
-    order: string[],
-    page: number
-  };
-
-  /**
-   * Create a new AddPageToCustomOrderAction
-   *
-   * @param url The unique url of the page for which the fields are being added
-   * @param fields The identifiable fields of which the updates are kept track of
-   * @param order A custom order to keep track of objects moving around
-   * @param page The page to populate in the custom order
-   */
-  constructor(
-    url: string,
-    fields: Identifiable[],
-    order: string[] = [],
-    page: number = 0
-  ) {
-    this.payload = { url, fields, order, page };
+    this.payload = { url, fields, lastModified, patchOperationService };
   }
 }
 
@@ -320,43 +283,6 @@ export class RemoveFieldUpdateAction implements Action {
   }
 }
 
-/**
- * An ngrx action to remove a single field update in the ObjectUpdates state for a certain page url and field uuid
- */
-export class MoveFieldUpdateAction implements Action {
-  type = ObjectUpdatesActionTypes.MOVE;
-  payload: {
-    url: string,
-    from: number,
-    to: number,
-    fromPage: number,
-    toPage: number,
-    field?: Identifiable
-  };
-
-  /**
-   * Create a new RemoveObjectUpdatesAction
-   *
-   * @param url
-   *    the unique url of the page for which a field's change should be removed
-   * @param from      The index of the object to move
-   * @param to        The index to move the object to
-   * @param fromPage  The page to move the object from
-   * @param toPage    The page to move the object to
-   * @param field     Optional field to add to the fieldUpdates list (useful when we want to track updates across multiple pages)
-   */
-  constructor(
-    url: string,
-    from: number,
-    to: number,
-    fromPage: number,
-    toPage: number,
-    field?: Identifiable
-  ) {
-    this.payload = { url, from, to, fromPage, toPage, field };
-  }
-}
-
 /* tslint:enable:max-classes-per-file */
 
 /**
@@ -369,8 +295,6 @@ export type ObjectUpdatesAction
   | ReinstateObjectUpdatesAction
   | RemoveObjectUpdatesAction
   | RemoveFieldUpdateAction
-  | MoveFieldUpdateAction
-  | AddPageToCustomOrderAction
   | RemoveAllObjectUpdatesAction
   | SelectVirtualMetadataAction
   | SetEditableFieldUpdateAction
diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
index bdf202049e6..b822da7e153 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
@@ -1,15 +1,19 @@
 import * as deepFreeze from 'deep-freeze';
 import {
-  AddFieldUpdateAction, AddPageToCustomOrderAction,
+  AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
-  InitializeFieldsAction, MoveFieldUpdateAction,
-  ReinstateObjectUpdatesAction, RemoveAllObjectUpdatesAction,
-  RemoveFieldUpdateAction, RemoveObjectUpdatesAction, SelectVirtualMetadataAction,
-  SetEditableFieldUpdateAction, SetValidFieldUpdateAction
+  InitializeFieldsAction,
+  ReinstateObjectUpdatesAction,
+  RemoveAllObjectUpdatesAction,
+  RemoveFieldUpdateAction,
+  RemoveObjectUpdatesAction,
+  SelectVirtualMetadataAction,
+  SetEditableFieldUpdateAction,
+  SetValidFieldUpdateAction
 } from './object-updates.actions';
 import { OBJECT_UPDATES_TRASH_PATH, objectUpdatesReducer } from './object-updates.reducer';
-import {Relationship} from '../../shared/item-relationships/relationship.model';
+import { Relationship } from '../../shared/item-relationships/relationship.model';
 
 class NullAction extends RemoveFieldUpdateAction {
   type = null;
@@ -85,16 +89,6 @@ describe('objectUpdatesReducer', () => {
       virtualMetadataSources: {
         [relationship.uuid]: {[identifiable1.uuid]: true}
       },
-      customOrder: {
-        initialOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        newOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        pageSize: 10,
-        changed: false
-      }
     }
   };
 
@@ -121,16 +115,6 @@ describe('objectUpdatesReducer', () => {
       virtualMetadataSources: {
         [relationship.uuid]: {[identifiable1.uuid]: true}
       },
-      customOrder: {
-        initialOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        newOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        pageSize: 10,
-        changed: false
-      }
     },
     [url + OBJECT_UPDATES_TRASH_PATH]: {
       fieldStates: {
@@ -165,16 +149,6 @@ describe('objectUpdatesReducer', () => {
       virtualMetadataSources: {
         [relationship.uuid]: {[identifiable1.uuid]: true}
       },
-      customOrder: {
-        initialOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        newOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        pageSize: 10,
-        changed: false
-      }
     }
   };
 
@@ -243,7 +217,7 @@ describe('objectUpdatesReducer', () => {
   });
 
   it('should initialize all fields when the INITIALIZE action is dispatched, based on the payload', () => {
-    const action = new InitializeFieldsAction(url, [identifiable1, identifiable3], modDate, [identifiable1.uuid, identifiable3.uuid], 10, 0);
+    const action = new InitializeFieldsAction(url, [identifiable1, identifiable3], modDate);
 
     const expectedState = {
       [url]: {
@@ -262,16 +236,7 @@ describe('objectUpdatesReducer', () => {
         fieldUpdates: {},
         virtualMetadataSources: {},
         lastModified: modDate,
-        customOrder: {
-          initialOrderPages: [
-            { order: [identifiable1.uuid, identifiable3.uuid] }
-          ],
-          newOrderPages: [
-            { order: [identifiable1.uuid, identifiable3.uuid] }
-          ],
-          pageSize: 10,
-          changed: false
-        }
+        patchOperationService: undefined
       }
     };
     const newState = objectUpdatesReducer(testState, action);
@@ -337,30 +302,4 @@ describe('objectUpdatesReducer', () => {
     const newState = objectUpdatesReducer(testState, action);
     expect(newState[url].fieldUpdates[uuid]).toBeUndefined();
   });
-
-  it('should move the custom order from the state when the MOVE action is dispatched', () => {
-    const action = new MoveFieldUpdateAction(url, 0, 1, 0, 0);
-
-    const newState = objectUpdatesReducer(testState, action);
-    expect(newState[url].customOrder.newOrderPages[0].order[0]).toEqual(testState[url].customOrder.newOrderPages[0].order[1]);
-    expect(newState[url].customOrder.newOrderPages[0].order[1]).toEqual(testState[url].customOrder.newOrderPages[0].order[0]);
-    expect(newState[url].customOrder.changed).toEqual(true);
-  });
-
-  it('should add a new page to the custom order and add empty pages in between when the ADD_PAGE_TO_CUSTOM_ORDER action is dispatched', () => {
-    const identifiable4 = {
-      uuid: 'a23eae5a-7857-4ef9-8e52-989436ad2955',
-      key: 'dc.description.abstract',
-      language: null,
-      value: 'Extra value'
-    };
-    const action = new AddPageToCustomOrderAction(url, [identifiable4], [identifiable4.uuid], 2);
-
-    const newState = objectUpdatesReducer(testState, action);
-    // Confirm the page in between the two pages (index 1) has been filled with 10 (page size) undefined values
-    expect(newState[url].customOrder.newOrderPages[1].order.length).toEqual(10);
-    expect(newState[url].customOrder.newOrderPages[1].order[0]).toBeUndefined();
-    // Verify the new page is correct
-    expect(newState[url].customOrder.newOrderPages[2].order[0]).toEqual(identifiable4.uuid);
-  });
 });
diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts
index 759a9f5c87c..f62c3e7c123 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.ts
@@ -1,8 +1,8 @@
 import {
-  AddFieldUpdateAction, AddPageToCustomOrderAction,
+  AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
-  InitializeFieldsAction, MoveFieldUpdateAction,
+  InitializeFieldsAction,
   ObjectUpdatesAction,
   ObjectUpdatesActionTypes,
   ReinstateObjectUpdatesAction,
@@ -12,10 +12,12 @@ import {
   SetValidFieldUpdateAction,
   SelectVirtualMetadataAction,
 } from './object-updates.actions';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
-import { from } from 'rxjs/internal/observable/from';
-import {Relationship} from '../../shared/item-relationships/relationship.model';
+import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { PatchOperationService } from './patch-operation-service/patch-operation.service';
+import { Item } from '../../shared/item.model';
+import { RelationshipType } from '../../shared/item-relationships/relationship-type.model';
+import { GenericConstructor } from '../../shared/generic-constructor';
 
 /**
  * Path where discarded objects are saved
@@ -50,7 +52,7 @@ export interface Identifiable {
  */
 export interface FieldUpdate {
   field: Identifiable,
-  changeType: FieldChangeType
+  changeType: FieldChangeType,
 }
 
 /**
@@ -74,29 +76,22 @@ export interface VirtualMetadataSource {
   [uuid: string]: boolean,
 }
 
+export interface RelationshipIdentifiable extends Identifiable {
+  nameVariant?: string,
+  relatedItem: Item;
+  relationship: Relationship;
+  type: RelationshipType;
+}
+
 /**
  * A fieldupdate interface which represents a relationship selected to be deleted,
  * along with a selection of the virtual metadata to keep
  */
-export interface DeleteRelationship extends Relationship {
+export interface DeleteRelationship extends RelationshipIdentifiable {
   keepLeftVirtualMetadata: boolean,
   keepRightVirtualMetadata: boolean,
 }
 
-/**
- * A custom order given to the list of objects
- */
-export interface CustomOrder {
-  initialOrderPages: OrderPage[],
-  newOrderPages: OrderPage[],
-  pageSize: number;
-  changed: boolean
-}
-
-export interface OrderPage {
-  order: string[]
-}
-
 /**
  * The updated state of a single page
  */
@@ -105,7 +100,7 @@ export interface ObjectUpdatesEntry {
   fieldUpdates: FieldUpdates;
   virtualMetadataSources: VirtualMetadataSources;
   lastModified: Date;
-  customOrder: CustomOrder
+  patchOperationService?: GenericConstructor<PatchOperationService>;
 }
 
 /**
@@ -138,9 +133,6 @@ export function objectUpdatesReducer(state = initialState, action: ObjectUpdates
     case ObjectUpdatesActionTypes.INITIALIZE_FIELDS: {
       return initializeFieldsUpdate(state, action as InitializeFieldsAction);
     }
-    case ObjectUpdatesActionTypes.ADD_PAGE_TO_CUSTOM_ORDER: {
-      return addPageToCustomOrder(state, action as AddPageToCustomOrderAction);
-    }
     case ObjectUpdatesActionTypes.ADD_FIELD: {
       return addFieldUpdate(state, action as AddFieldUpdateAction);
     }
@@ -168,9 +160,6 @@ export function objectUpdatesReducer(state = initialState, action: ObjectUpdates
     case ObjectUpdatesActionTypes.SET_VALID_FIELD: {
       return setValidFieldUpdate(state, action as SetValidFieldUpdateAction);
     }
-    case ObjectUpdatesActionTypes.MOVE: {
-      return moveFieldUpdate(state, action as MoveFieldUpdateAction);
-    }
     default: {
       return state;
     }
@@ -186,11 +175,8 @@ function initializeFieldsUpdate(state: any, action: InitializeFieldsAction) {
   const url: string = action.payload.url;
   const fields: Identifiable[] = action.payload.fields;
   const lastModifiedServer: Date = action.payload.lastModified;
-  const order = action.payload.order;
-  const pageSize = action.payload.pageSize;
-  const page = action.payload.page;
+  const patchOperationService: GenericConstructor<PatchOperationService> = action.payload.patchOperationService;
   const fieldStates = createInitialFieldStates(fields);
-  const initialOrderPages = addOrderToPages([], order, pageSize, page);
   const newPageState = Object.assign(
     {},
     state[url],
@@ -198,38 +184,11 @@ function initializeFieldsUpdate(state: any, action: InitializeFieldsAction) {
     { fieldUpdates: {} },
     { virtualMetadataSources: {} },
     { lastModified: lastModifiedServer },
-    { customOrder: {
-      initialOrderPages: initialOrderPages,
-      newOrderPages: initialOrderPages,
-      pageSize: pageSize,
-      changed: false }
-    }
+    { patchOperationService }
   );
   return Object.assign({}, state, { [url]: newPageState });
 }
 
-/**
- * Add a page of objects to the state of a specific url and update a specific page of the custom order
- * @param state The current state
- * @param action The action to perform on the current state
- */
-function addPageToCustomOrder(state: any, action: AddPageToCustomOrderAction) {
-  const url: string = action.payload.url;
-  const fields: Identifiable[] = action.payload.fields;
-  const fieldStates = createInitialFieldStates(fields);
-  const order = action.payload.order;
-  const page = action.payload.page;
-  const pageState: ObjectUpdatesEntry = state[url] || {};
-  const newPageState = Object.assign({}, pageState, {
-    fieldStates: Object.assign({}, pageState.fieldStates, fieldStates),
-    customOrder: Object.assign({}, pageState.customOrder, {
-      newOrderPages: addOrderToPages(pageState.customOrder.newOrderPages, order, pageState.customOrder.pageSize, page),
-      initialOrderPages: addOrderToPages(pageState.customOrder.initialOrderPages, order, pageState.customOrder.pageSize, page)
-    })
-  });
-  return Object.assign({}, state, { [url]: newPageState });
-}
-
 /**
  * Add a new update for a specific field to the store
  * @param state The current state
@@ -239,7 +198,7 @@ function addFieldUpdate(state: any, action: AddFieldUpdateAction) {
   const url: string = action.payload.url;
   const field: Identifiable = action.payload.field;
   const changeType: FieldChangeType = action.payload.changeType;
-  const pageState: ObjectUpdatesEntry = state[url] || {};
+  const pageState: ObjectUpdatesEntry = state[url] || {fieldUpdates: {}};
 
   let states = pageState.fieldStates;
   if (changeType === FieldChangeType.ADD) {
@@ -338,19 +297,9 @@ function discardObjectUpdatesFor(url: string, state: any) {
     }
   });
 
-  const newCustomOrder = Object.assign({}, pageState.customOrder);
-  if (pageState.customOrder.changed) {
-    const initialOrder = pageState.customOrder.initialOrderPages;
-    if (isNotEmpty(initialOrder)) {
-      newCustomOrder.newOrderPages = initialOrder;
-      newCustomOrder.changed = false;
-    }
-  }
-
   const discardedPageState = Object.assign({}, pageState, {
     fieldUpdates: {},
-    fieldStates: newFieldStates,
-    customOrder: newCustomOrder
+    fieldStates: newFieldStates
   });
   return Object.assign({}, state, { [url]: discardedPageState }, { [url + OBJECT_UPDATES_TRASH_PATH]: pageState });
 }
@@ -504,121 +453,3 @@ function createInitialFieldStates(fields: Identifiable[]) {
   uuids.forEach((uuid: string) => fieldStates[uuid] = initialFieldState);
   return fieldStates;
 }
-
-/**
- * Method to add a list of objects to an existing FieldStates object
- * @param fieldStates                   FieldStates to add states to
- * @param fields Identifiable objects   The list of objects to add to the FieldStates
- */
-function addFieldStates(fieldStates: FieldStates, fields: Identifiable[]) {
-  const uuids = fields.map((field: Identifiable) => field.uuid);
-  uuids.forEach((uuid: string) => fieldStates[uuid] = initialFieldState);
-  return fieldStates;
-}
-
-/**
- * Move an object within the custom order of a page state
- * @param state   The current state
- * @param action  The move action to perform
- */
-function moveFieldUpdate(state: any, action: MoveFieldUpdateAction) {
-  const url = action.payload.url;
-  const fromIndex = action.payload.from;
-  const toIndex = action.payload.to;
-  const fromPage = action.payload.fromPage;
-  const toPage = action.payload.toPage;
-  const field = action.payload.field;
-
-  const pageState: ObjectUpdatesEntry = state[url];
-  const initialOrderPages = pageState.customOrder.initialOrderPages;
-  const customOrderPages = [...pageState.customOrder.newOrderPages];
-
-  // Create a copy of the custom orders for the from- and to-pages
-  const fromPageOrder = [...customOrderPages[fromPage].order];
-  const toPageOrder = [...customOrderPages[toPage].order];
-  if (fromPage === toPage) {
-    if (isNotEmpty(customOrderPages[fromPage]) && isNotEmpty(customOrderPages[fromPage].order[fromIndex]) && isNotEmpty(customOrderPages[fromPage].order[toIndex])) {
-      // Move an item from one index to another within the same page
-      moveItemInArray(fromPageOrder, fromIndex, toIndex);
-      // Update the custom order for this page
-      customOrderPages[fromPage] = { order: fromPageOrder };
-    }
-  } else {
-    if (isNotEmpty(customOrderPages[fromPage]) && hasValue(customOrderPages[toPage]) && isNotEmpty(customOrderPages[fromPage].order[fromIndex])) {
-      // Move an item from one index of one page to an index in another page
-      transferArrayItem(fromPageOrder, toPageOrder, fromIndex, toIndex);
-      // Update the custom order for both pages
-      customOrderPages[fromPage] = { order: fromPageOrder };
-      customOrderPages[toPage] = { order: toPageOrder };
-    }
-  }
-
-  // Create a field update if it doesn't exist for this field yet
-  let fieldUpdate = {};
-  if (hasValue(field)) {
-    fieldUpdate = pageState.fieldUpdates[field.uuid];
-    if (hasNoValue(fieldUpdate)) {
-      fieldUpdate = { field: field, changeType: undefined }
-    }
-  }
-
-  // Update the store's state with new values and return
-  return Object.assign({}, state, { [url]: Object.assign({}, pageState, {
-    fieldUpdates: Object.assign({}, pageState.fieldUpdates, hasValue(field) ? { [field.uuid]: fieldUpdate } : {}),
-    customOrder: Object.assign({}, pageState.customOrder, { newOrderPages: customOrderPages, changed: checkForOrderChanges(initialOrderPages, customOrderPages) })
-  })})
-}
-
-/**
- * Compare two lists of OrderPage objects and return whether there's at least one change in the order of objects within
- * @param initialOrderPages The initial list of OrderPages
- * @param customOrderPages  The changed list of OrderPages
- */
-function checkForOrderChanges(initialOrderPages: OrderPage[], customOrderPages: OrderPage[]) {
-  let changed = false;
-  initialOrderPages.forEach((orderPage: OrderPage, page: number) => {
-    if (isNotEmpty(orderPage) && isNotEmpty(orderPage.order) && isNotEmpty(customOrderPages[page]) && isNotEmpty(customOrderPages[page].order)) {
-      orderPage.order.forEach((id: string, index: number) => {
-        if (id !== customOrderPages[page].order[index]) {
-          changed = true;
-          return;
-        }
-      });
-      if (changed) {
-        return;
-      }
-    }
-  });
-  return changed;
-}
-
-/**
- * Initialize a custom order page by providing the list of all pages, a list of UUIDs, pageSize and the page to populate
- * @param initialPages  The initial list of OrderPage objects
- * @param order         The list of UUIDs to create a page for
- * @param pageSize      The pageSize used to populate empty spacer pages
- * @param page          The index of the page to add
- */
-function addOrderToPages(initialPages: OrderPage[], order: string[], pageSize: number, page: number): OrderPage[] {
-  const result = [...initialPages];
-  const orderPage: OrderPage = { order: order };
-  if (page < result.length) {
-    // The page we're trying to add already exists in the list. Overwrite it.
-    result[page] = orderPage;
-  } else if (page === result.length) {
-    // The page we're trying to add is the next page in the list, add it.
-    result.push(orderPage);
-  } else {
-    // The page we're trying to add is at least one page ahead of the list, fill the list with empty pages before adding the page.
-    const emptyOrder = [];
-    for (let i = 0; i < pageSize; i++) {
-      emptyOrder.push(undefined);
-    }
-    const emptyOrderPage: OrderPage = { order: emptyOrder };
-    for (let i = result.length; i < page; i++) {
-      result.push(emptyOrderPage);
-    }
-    result.push(orderPage);
-  }
-  return result;
-}
diff --git a/src/app/core/data/object-updates/object-updates.service.spec.ts b/src/app/core/data/object-updates/object-updates.service.spec.ts
index 780a402a846..ff9f1ae6082 100644
--- a/src/app/core/data/object-updates/object-updates.service.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.service.spec.ts
@@ -2,19 +2,20 @@ import { Store } from '@ngrx/store';
 import { CoreState } from '../../core.reducers';
 import { ObjectUpdatesService } from './object-updates.service';
 import {
-  AddPageToCustomOrderAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
-  InitializeFieldsAction, ReinstateObjectUpdatesAction, RemoveFieldUpdateAction, SelectVirtualMetadataAction,
+  InitializeFieldsAction,
+  ReinstateObjectUpdatesAction,
+  RemoveFieldUpdateAction,
+  SelectVirtualMetadataAction,
   SetEditableFieldUpdateAction
 } from './object-updates.actions';
 import { of as observableOf } from 'rxjs';
 import { Notification } from '../../../shared/notifications/models/notification.model';
 import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { OBJECT_UPDATES_TRASH_PATH } from './object-updates.reducer';
-import {Relationship} from '../../shared/item-relationships/relationship.model';
-import { MoveOperation } from 'fast-json-patch/lib/core';
-import { ArrayMoveChangeAnalyzer } from '../array-move-change-analyzer.service';
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { Injector } from '@angular/core';
 
 describe('ObjectUpdatesService', () => {
   let service: ObjectUpdatesService;
@@ -34,6 +35,8 @@ describe('ObjectUpdatesService', () => {
   };
 
   const modDate = new Date(2010, 2, 11);
+  let patchOperationService;
+  let injector: Injector;
 
   beforeEach(() => {
     const fieldStates = {
@@ -42,12 +45,18 @@ describe('ObjectUpdatesService', () => {
       [identifiable3.uuid]: { editable: true, isNew: true, isValid: true },
     };
 
+    patchOperationService = jasmine.createSpyObj('patchOperationService', {
+      fieldUpdatesToPatchOperations: []
+    });
     const objectEntry = {
-      fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}
+      fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, patchOperationService
     };
     store = new Store<CoreState>(undefined, undefined, undefined);
     spyOn(store, 'dispatch');
-    service = new ObjectUpdatesService(store, new ArrayMoveChangeAnalyzer<string>());
+    injector = jasmine.createSpyObj('injector', {
+      get: patchOperationService
+    });
+    service = new ObjectUpdatesService(store, injector);
 
     spyOn(service as any, 'getObjectEntry').and.returnValue(observableOf(objectEntry));
     spyOn(service as any, 'getFieldState').and.callFake((uuid) => {
@@ -63,25 +72,6 @@ describe('ObjectUpdatesService', () => {
     });
   });
 
-  describe('initializeWithCustomOrder', () => {
-    const pageSize = 20;
-    const page = 0;
-
-    it('should dispatch an INITIALIZE action with the correct URL, initial identifiables, last modified , custom order, page size and page', () => {
-      service.initializeWithCustomOrder(url, identifiables, modDate, pageSize, page);
-      expect(store.dispatch).toHaveBeenCalledWith(new InitializeFieldsAction(url, identifiables, modDate, identifiables.map((identifiable) => identifiable.uuid), pageSize, page));
-    });
-  });
-
-  describe('addPageToCustomOrder', () => {
-    const page = 2;
-
-    it('should dispatch an ADD_PAGE_TO_CUSTOM_ORDER action with the correct URL, identifiables, custom order and page number to add', () => {
-      service.addPageToCustomOrder(url, identifiables, page);
-      expect(store.dispatch).toHaveBeenCalledWith(new AddPageToCustomOrderAction(url, identifiables, identifiables.map((identifiable) => identifiable.uuid), page));
-    });
-  });
-
   describe('getFieldUpdates', () => {
     it('should return the list of all fields, including their update if there is one', () => {
       const result$ = service.getFieldUpdates(url, identifiables);
@@ -116,49 +106,6 @@ describe('ObjectUpdatesService', () => {
     });
   });
 
-  describe('getFieldUpdatesByCustomOrder', () => {
-    beforeEach(() => {
-      const fieldStates = {
-        [identifiable1.uuid]: { editable: false, isNew: false, isValid: true },
-        [identifiable2.uuid]: { editable: true, isNew: false, isValid: false },
-        [identifiable3.uuid]: { editable: true, isNew: true, isValid: true },
-      };
-
-      const customOrder = {
-        initialOrderPages: [{
-          order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid]
-        }],
-        newOrderPages: [{
-          order: [identifiable2.uuid, identifiable3.uuid, identifiable1.uuid]
-        }],
-        pageSize: 20,
-        changed: true
-      };
-
-      const objectEntry = {
-        fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, customOrder
-      };
-
-      (service as any).getObjectEntry.and.returnValue(observableOf(objectEntry))
-    });
-
-    it('should return the list of all fields, including their update if there is one, ordered by their custom order', (done) => {
-      const result$ = service.getFieldUpdatesByCustomOrder(url, identifiables);
-      expect((service as any).getObjectEntry).toHaveBeenCalledWith(url);
-
-      const expectedResult = {
-        [identifiable2.uuid]: { field: identifiable2, changeType: undefined },
-        [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD },
-        [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE }
-      };
-
-      result$.subscribe((result) => {
-        expect(result).toEqual(expectedResult);
-        done();
-      });
-    });
-  });
-
   describe('isEditable', () => {
     it('should return false if this identifiable is currently not editable in the store', () => {
       const result$ = service.isEditable(url, identifiable1.uuid);
@@ -274,11 +221,7 @@ describe('ObjectUpdatesService', () => {
     });
     describe('when updates are emtpy', () => {
       beforeEach(() => {
-        (service as any).getObjectEntry.and.returnValue(observableOf({
-          customOrder: {
-            changed: false
-          }
-        }))
+        (service as any).getObjectEntry.and.returnValue(observableOf({}))
       });
 
       it('should return false when there are no updates', () => {
@@ -346,41 +289,23 @@ describe('ObjectUpdatesService', () => {
     });
   });
 
-  describe('getMoveOperations', () => {
-    beforeEach(() => {
-      const fieldStates = {
-        [identifiable1.uuid]: { editable: false, isNew: false, isValid: true },
-        [identifiable2.uuid]: { editable: true, isNew: false, isValid: false },
-        [identifiable3.uuid]: { editable: true, isNew: true, isValid: true },
-      };
-
-      const customOrder = {
-        initialOrderPages: [{
-          order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid]
-        }],
-        newOrderPages: [{
-          order: [identifiable2.uuid, identifiable3.uuid, identifiable1.uuid]
-        }],
-        pageSize: 20,
-        changed: true
-      };
-
-      const objectEntry = {
-        fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, customOrder
-      };
+  describe('createPatch', () => {
+    let result$;
 
-      (service as any).getObjectEntry.and.returnValue(observableOf(objectEntry))
+    beforeEach(() => {
+      result$ = service.createPatch(url);
     });
 
-    it('should return the expected move operations', (done) => {
-      const result$ = service.getMoveOperations(url);
-
-      const expectedResult = [
-        { op: 'move', from: '/0', path: '/2' }
-      ] as MoveOperation[];
+    it('should inject the service stored in the entry', (done) => {
+      result$.subscribe(() => {
+        expect(injector.get).toHaveBeenCalledWith(patchOperationService);
+        done();
+      });
+    });
 
-      result$.subscribe((result) => {
-        expect(result).toEqual(expectedResult);
+    it('should create a patch from the fieldUpdates using the injected service', (done) => {
+      result$.subscribe(() => {
+        expect(patchOperationService.fieldUpdatesToPatchOperations).toHaveBeenCalledWith(fieldUpdates);
         done();
       });
     });
diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts
index c9a7f47e811..0d27ccd7e61 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Injector } from '@angular/core';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { CoreState } from '../../core.reducers';
 import { coreSelector } from '../../core.selectors';
@@ -8,16 +8,15 @@ import {
   Identifiable,
   OBJECT_UPDATES_TRASH_PATH,
   ObjectUpdatesEntry,
-  ObjectUpdatesState, OrderPage,
+  ObjectUpdatesState,
   VirtualMetadataSource
 } from './object-updates.reducer';
 import { Observable } from 'rxjs';
 import {
-  AddFieldUpdateAction, AddPageToCustomOrderAction,
+  AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
   InitializeFieldsAction,
-  MoveFieldUpdateAction,
   ReinstateObjectUpdatesAction,
   RemoveFieldUpdateAction,
   SelectVirtualMetadataAction,
@@ -25,11 +24,17 @@ import {
   SetValidFieldUpdateAction
 } from './object-updates.actions';
 import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  hasValueOperator
+} from '../../../shared/empty.util';
 import { INotification } from '../../../shared/notifications/models/notification.model';
-import { ArrayMoveChangeAnalyzer } from '../array-move-change-analyzer.service';
-import { MoveOperation } from 'fast-json-patch/lib/core';
-import { flatten } from '@angular/compiler';
+import { Operation } from 'fast-json-patch';
+import { PatchOperationService } from './patch-operation-service/patch-operation.service';
+import { GenericConstructor } from '../../shared/generic-constructor';
 
 function objectUpdatesStateSelector(): MemoizedSelector<CoreState, ObjectUpdatesState> {
   return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']);
@@ -53,8 +58,7 @@ function virtualMetadataSourceSelector(url: string, source: string): MemoizedSel
 @Injectable()
 export class ObjectUpdatesService {
   constructor(private store: Store<CoreState>,
-              private comparator: ArrayMoveChangeAnalyzer<string>) {
-
+              private injector: Injector) {
   }
 
   /**
@@ -62,31 +66,10 @@ export class ObjectUpdatesService {
    * @param url The page's URL for which the changes are being mapped
    * @param fields The initial fields for the page's object
    * @param lastModified The date the object was last modified
+   * @param patchOperationService A {@link PatchOperationService} used for creating a patch
    */
-  initialize(url, fields: Identifiable[], lastModified: Date): void {
-    this.store.dispatch(new InitializeFieldsAction(url, fields, lastModified));
-  }
-
-  /**
-   * Method to dispatch an InitializeFieldsAction to the store and keeping track of the order objects are stored
-   * @param url The page's URL for which the changes are being mapped
-   * @param fields The initial fields for the page's object
-   * @param lastModified The date the object was last modified
-   * @param pageSize The page size to use for adding pages to the custom order
-   * @param page The first page to populate the custom order with
-   */
-  initializeWithCustomOrder(url, fields: Identifiable[], lastModified: Date, pageSize = 9999, page = 0): void {
-    this.store.dispatch(new InitializeFieldsAction(url, fields, lastModified, fields.map((field) => field.uuid), pageSize, page));
-  }
-
-  /**
-   * Method to dispatch an AddPageToCustomOrderAction, adding a new page to an already existing custom order tracking
-   * @param url     The URL for which the changes are being mapped
-   * @param fields  The fields to add a new page for
-   * @param page    The page number (starting from index 0)
-   */
-  addPageToCustomOrder(url, fields: Identifiable[], page: number): void {
-    this.store.dispatch(new AddPageToCustomOrderAction(url, fields, fields.map((field) => field.uuid), page));
+  initialize(url, fields: Identifiable[], lastModified: Date, patchOperationService?: GenericConstructor<PatchOperationService>): void {
+    this.store.dispatch(new InitializeFieldsAction(url, fields, lastModified, patchOperationService));
   }
 
   /**
@@ -153,7 +136,9 @@ export class ObjectUpdatesService {
    */
   getFieldUpdatesExclusive(url: string, initialFields: Identifiable[]): Observable<FieldUpdates> {
     const objectUpdates = this.getObjectEntry(url);
-    return objectUpdates.pipe(map((objectEntry) => {
+    return objectUpdates.pipe(
+      hasValueOperator(),
+      map((objectEntry) => {
       const fieldUpdates: FieldUpdates = {};
       for (const object of initialFields) {
         let fieldUpdate = objectEntry.fieldUpdates[object.uuid];
@@ -166,31 +151,6 @@ export class ObjectUpdatesService {
     }))
   }
 
-  /**
-   * Method that combines the state's updates with the initial values (when there's no update),
-   * sorted by their custom order to create a FieldUpdates object
-   * @param url The URL of the page for which the FieldUpdates should be requested
-   * @param initialFields The initial values of the fields
-   * @param page The page to retrieve
-   */
-  getFieldUpdatesByCustomOrder(url: string, initialFields: Identifiable[], page = 0): Observable<FieldUpdates> {
-    const objectUpdates = this.getObjectEntry(url);
-    return objectUpdates.pipe(map((objectEntry) => {
-      const fieldUpdates: FieldUpdates = {};
-      if (hasValue(objectEntry) && hasValue(objectEntry.customOrder) && isNotEmpty(objectEntry.customOrder.newOrderPages) && page < objectEntry.customOrder.newOrderPages.length) {
-        for (const uuid of objectEntry.customOrder.newOrderPages[page].order) {
-          let fieldUpdate = objectEntry.fieldUpdates[uuid];
-          if (isEmpty(fieldUpdate)) {
-            const identifiable = initialFields.find((object: Identifiable) => object.uuid === uuid);
-            fieldUpdate = {field: identifiable, changeType: undefined};
-          }
-          fieldUpdates[uuid] = fieldUpdate;
-        }
-      }
-      return fieldUpdates;
-    }))
-  }
-
   /**
    * Method to check if a specific field is currently editable in the store
    * @param url The URL of the page on which the field resides
@@ -260,19 +220,6 @@ export class ObjectUpdatesService {
     this.saveFieldUpdate(url, field, FieldChangeType.UPDATE);
   }
 
-  /**
-   * Dispatches a MoveFieldUpdateAction
-   * @param url       The page's URL for which the changes are saved
-   * @param from      The index of the object to move
-   * @param to        The index to move the object to
-   * @param fromPage  The page to move the object from
-   * @param toPage    The page to move the object to
-   * @param field     Optional field to add to the fieldUpdates list (useful if we want to track updates across multiple pages)
-   */
-  saveMoveFieldUpdate(url: string, from: number, to: number, fromPage = 0, toPage = 0, field?: Identifiable) {
-    this.store.dispatch(new MoveFieldUpdateAction(url, from, to, fromPage, toPage, field));
-  }
-
   /**
    * Check whether the virtual metadata of a given item is selected to be saved as real metadata
    * @param url           The URL of the page on which the field resides
@@ -387,7 +334,7 @@ export class ObjectUpdatesService {
    * @param url The page's url to check for in the store
    */
   hasUpdates(url: string): Observable<boolean> {
-    return this.getObjectEntry(url).pipe(map((objectEntry) => hasValue(objectEntry) && (isNotEmpty(objectEntry.fieldUpdates) || objectEntry.customOrder.changed)));
+    return this.getObjectEntry(url).pipe(map((objectEntry) => hasValue(objectEntry) && isNotEmpty(objectEntry.fieldUpdates)));
   }
 
   /**
@@ -407,17 +354,20 @@ export class ObjectUpdatesService {
   }
 
   /**
-   * Get move operations based on the custom order
-   * @param url The page's url
+   * Create a patch from the current object-updates state
+   * The {@link ObjectUpdatesEntry} should contain a patchOperationService, in order to define how a patch should
+   * be created. If it doesn't, an empty patch will be returned.
+   * @param url The URL of the page for which the patch should be created
    */
-  getMoveOperations(url: string): Observable<MoveOperation[]> {
+  createPatch(url: string): Observable<Operation[]> {
     return this.getObjectEntry(url).pipe(
-      map((objectEntry) => objectEntry.customOrder),
-      map((customOrder) => this.comparator.diff(
-        flatten(customOrder.initialOrderPages.map((orderPage: OrderPage) => orderPage.order)),
-        flatten(customOrder.newOrderPages.map((orderPage: OrderPage) => orderPage.order)))
-      )
+      map((entry) => {
+        let patch = [];
+        if (hasValue(entry.patchOperationService)) {
+          patch = this.injector.get(entry.patchOperationService).fieldUpdatesToPatchOperations(entry.fieldUpdates);
+        }
+        return patch;
+      })
     );
   }
-
 }
diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
new file mode 100644
index 00000000000..f3578b1bde3
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
@@ -0,0 +1,252 @@
+import { MetadataPatchOperationService } from './metadata-patch-operation.service';
+import { FieldUpdates } from '../object-updates.reducer';
+import { Operation } from 'fast-json-patch';
+import { FieldChangeType } from '../object-updates.actions';
+import { MetadatumViewModel } from '../../../shared/metadata.models';
+
+describe('MetadataPatchOperationService', () => {
+  let service: MetadataPatchOperationService;
+
+  beforeEach(() => {
+    service = new MetadataPatchOperationService();
+  });
+
+  describe('fieldUpdatesToPatchOperations', () => {
+    let fieldUpdates: FieldUpdates;
+    let expected: Operation[];
+    let result: Operation[];
+
+    describe('when fieldUpdates contains a single remove', () => {
+      beforeEach(() => {
+        fieldUpdates = Object.assign({
+          update1: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Deleted title',
+              place: 0
+            }),
+            changeType: FieldChangeType.REMOVE
+          }
+        });
+        expected = [
+          { op: 'remove', path: '/metadata/dc.title/0' }
+        ] as any[];
+        result = service.fieldUpdatesToPatchOperations(fieldUpdates);
+      });
+
+      it('should contain a single remove operation with the correct path', () => {
+        expect(result).toEqual(expected);
+      });
+    });
+
+    describe('when fieldUpdates contains a single add', () => {
+      beforeEach(() => {
+        fieldUpdates = Object.assign({
+          update1: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Added title',
+              place: 0
+            }),
+            changeType: FieldChangeType.ADD
+          }
+        });
+        expected = [
+          { op: 'add', path: '/metadata/dc.title/-', value: [ { value: 'Added title', language: undefined } ] }
+        ] as any[];
+        result = service.fieldUpdatesToPatchOperations(fieldUpdates);
+      });
+
+      it('should contain a single add operation with the correct path', () => {
+        expect(result).toEqual(expected);
+      });
+    });
+
+    describe('when fieldUpdates contains a single update', () => {
+      beforeEach(() => {
+        fieldUpdates = Object.assign({
+          update1: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Changed title',
+              place: 0
+            }),
+            changeType: FieldChangeType.UPDATE
+          }
+        });
+        expected = [
+          { op: 'replace', path: '/metadata/dc.title/0', value: { value: 'Changed title', language: undefined } }
+        ] as any[];
+        result = service.fieldUpdatesToPatchOperations(fieldUpdates);
+      });
+
+      it('should contain a single replace operation with the correct path', () => {
+        expect(result).toEqual(expected);
+      });
+    });
+
+    describe('when fieldUpdates contains multiple removes with incrementing indexes', () => {
+      beforeEach(() => {
+        fieldUpdates = Object.assign({
+          update1: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'First deleted title',
+              place: 0
+            }),
+            changeType: FieldChangeType.REMOVE
+          },
+          update2: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Second deleted title',
+              place: 1
+            }),
+            changeType: FieldChangeType.REMOVE
+          },
+          update3: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Third deleted title',
+              place: 2
+            }),
+            changeType: FieldChangeType.REMOVE
+          }
+        });
+        expected = [
+          { op: 'remove', path: '/metadata/dc.title/0' },
+          { op: 'remove', path: '/metadata/dc.title/0' },
+          { op: 'remove', path: '/metadata/dc.title/0' }
+        ] as any[];
+        result = service.fieldUpdatesToPatchOperations(fieldUpdates);
+      });
+
+      it('should contain all the remove operations on the same index', () => {
+        expect(result).toEqual(expected);
+      });
+    });
+
+    describe('when fieldUpdates contains multiple removes with decreasing indexes', () => {
+      beforeEach(() => {
+        fieldUpdates = Object.assign({
+          update1: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Third deleted title',
+              place: 2
+            }),
+            changeType: FieldChangeType.REMOVE
+          },
+          update2: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Second deleted title',
+              place: 1
+            }),
+            changeType: FieldChangeType.REMOVE
+          },
+          update3: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'First deleted title',
+              place: 0
+            }),
+            changeType: FieldChangeType.REMOVE
+          }
+        });
+        expected = [
+          { op: 'remove', path: '/metadata/dc.title/2' },
+          { op: 'remove', path: '/metadata/dc.title/1' },
+          { op: 'remove', path: '/metadata/dc.title/0' }
+        ] as any[];
+        result = service.fieldUpdatesToPatchOperations(fieldUpdates);
+      });
+
+      it('should contain all the remove operations with their corresponding indexes', () => {
+        expect(result).toEqual(expected);
+      });
+    });
+
+    describe('when fieldUpdates contains multiple removes with random indexes', () => {
+      beforeEach(() => {
+        fieldUpdates = Object.assign({
+          update1: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Second deleted title',
+              place: 1
+            }),
+            changeType: FieldChangeType.REMOVE
+          },
+          update2: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Third deleted title',
+              place: 2
+            }),
+            changeType: FieldChangeType.REMOVE
+          },
+          update3: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'First deleted title',
+              place: 0
+            }),
+            changeType: FieldChangeType.REMOVE
+          }
+        });
+        expected = [
+          { op: 'remove', path: '/metadata/dc.title/1' },
+          { op: 'remove', path: '/metadata/dc.title/1' },
+          { op: 'remove', path: '/metadata/dc.title/0' }
+        ] as any[];
+        result = service.fieldUpdatesToPatchOperations(fieldUpdates);
+      });
+
+      it('should contain all the remove operations with the correct indexes taking previous operations into account', () => {
+        expect(result).toEqual(expected);
+      });
+    });
+
+    describe('when fieldUpdates contains multiple removes and updates with random indexes', () => {
+      beforeEach(() => {
+        fieldUpdates = Object.assign({
+          update1: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Second deleted title',
+              place: 1
+            }),
+            changeType: FieldChangeType.REMOVE
+          },
+          update2: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'Third changed title',
+              place: 2
+            }),
+            changeType: FieldChangeType.UPDATE
+          },
+          update3: {
+            field: Object.assign(new MetadatumViewModel(), {
+              key: 'dc.title',
+              value: 'First deleted title',
+              place: 0
+            }),
+            changeType: FieldChangeType.REMOVE
+          }
+        });
+        expected = [
+          { op: 'remove', path: '/metadata/dc.title/1' },
+          { op: 'replace', path: '/metadata/dc.title/1', value: { value: 'Third changed title', language: undefined } },
+          { op: 'remove', path: '/metadata/dc.title/0' }
+        ] as any[];
+        result = service.fieldUpdatesToPatchOperations(fieldUpdates);
+      });
+
+      it('should contain all the remove and replace operations with the correct indexes taking previous remove operations into account', () => {
+        expect(result).toEqual(expected);
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
new file mode 100644
index 00000000000..e1c356f9f9c
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
@@ -0,0 +1,100 @@
+import { PatchOperationService } from './patch-operation.service';
+import { MetadatumViewModel } from '../../../shared/metadata.models';
+import { FieldUpdates } from '../object-updates.reducer';
+import { Operation } from 'fast-json-patch';
+import { FieldChangeType } from '../object-updates.actions';
+import { Injectable } from '@angular/core';
+import { MetadataPatchOperation } from './operations/metadata/metadata-patch-operation.model';
+import { hasValue } from '../../../../shared/empty.util';
+import { MetadataPatchAddOperation } from './operations/metadata/metadata-patch-add-operation.model';
+import { MetadataPatchRemoveOperation } from './operations/metadata/metadata-patch-remove-operation.model';
+import { MetadataPatchReplaceOperation } from './operations/metadata/metadata-patch-replace-operation.model';
+
+/**
+ * Service transforming {@link FieldUpdates} into {@link Operation}s for metadata values
+ * This expects the fields within every {@link FieldUpdate} to be {@link MetadatumViewModel}s
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class MetadataPatchOperationService implements PatchOperationService {
+
+  /**
+   * Transform a {@link FieldUpdates} object into an array of fast-json-patch Operations for metadata values
+   * This method first creates an array of {@link MetadataPatchOperation} wrapper operations, which are then
+   * iterated over to create the actual patch operations. While iterating, it has the ability to check for previous
+   * operations that would modify the operation's position and act accordingly.
+   * @param fieldUpdates
+   */
+  fieldUpdatesToPatchOperations(fieldUpdates: FieldUpdates): Operation[] {
+    const metadataPatch = this.fieldUpdatesToMetadataPatchOperations(fieldUpdates);
+
+    // This map stores what metadata fields had a value deleted at which places
+    // This is used to modify the place of operations to match previous operations
+    const metadataRemoveMap = new Map<string, number[]>();
+    const patch = [];
+    metadataPatch.forEach((operation) => {
+      // If this operation is removing or editing an existing value, first check the map for previous operations
+      // If the map contains remove operations before this operation's place, lower the place by 1 for each
+      if ((operation.op === MetadataPatchRemoveOperation.operationType || operation.op === MetadataPatchReplaceOperation.operationType) && hasValue((operation as any).place)) {
+        if (metadataRemoveMap.has(operation.field)) {
+          metadataRemoveMap.get(operation.field).forEach((index) => {
+            if (index < (operation as any).place) {
+              (operation as any).place--;
+            }
+          });
+        }
+      }
+
+      // If this is a remove operation, add its (updated) place to the map, so we can adjust following operations accordingly
+      if (operation.op === MetadataPatchRemoveOperation.operationType && hasValue((operation as any).place)) {
+        if (!metadataRemoveMap.has(operation.field)) {
+          metadataRemoveMap.set(operation.field, []);
+        }
+        metadataRemoveMap.get(operation.field).push((operation as any).place);
+      }
+
+      // Transform the updated operation into a fast-json-patch Operation and add it to the patch
+      patch.push(operation.toOperation());
+    });
+
+    return patch;
+  }
+
+  /**
+   * Transform a {@link FieldUpdates} object into an array of {@link MetadataPatchOperation} wrapper objects
+   * These wrapper objects contain detailed information about the patch operation that needs to be creates for each update
+   * This information can then be modified before creating the actual patch
+   * @param fieldUpdates
+   */
+  fieldUpdatesToMetadataPatchOperations(fieldUpdates: FieldUpdates): MetadataPatchOperation[] {
+    const metadataPatch = [];
+
+    Object.keys(fieldUpdates).forEach((uuid) => {
+      const update = fieldUpdates[uuid];
+      const metadatum = update.field as MetadatumViewModel;
+      const val = {
+        value: metadatum.value,
+        language: metadatum.language
+      }
+
+      let operation: MetadataPatchOperation;
+      switch (update.changeType) {
+        case FieldChangeType.ADD:
+          operation = new MetadataPatchAddOperation(metadatum.key, [ val ]);
+          break;
+        case FieldChangeType.REMOVE:
+          operation = new MetadataPatchRemoveOperation(metadatum.key, metadatum.place);
+          break;
+        case FieldChangeType.UPDATE:
+          operation = new MetadataPatchReplaceOperation(metadatum.key, metadatum.place, val);
+          break;
+      }
+
+      metadataPatch.push(operation);
+    });
+
+    return metadataPatch;
+  }
+
+}
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
new file mode 100644
index 00000000000..7f9b1d772f4
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
@@ -0,0 +1,27 @@
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Wrapper object for a metadata patch add Operation
+ */
+export class MetadataPatchAddOperation extends MetadataPatchOperation {
+  static operationType = 'add';
+
+  /**
+   * The metadata value(s) to add to the field
+   */
+  value: any;
+
+  constructor(field: string, value: any) {
+    super(MetadataPatchAddOperation.operationType, field);
+    this.value = value;
+  }
+
+  /**
+   * Transform the MetadataPatchOperation into a fast-json-patch Operation by constructing its path and other properties
+   * using the information provided.
+   */
+  toOperation(): Operation {
+    return { op: this.op as any, path: `/metadata/${this.field}/-`, value: this.value };
+  }
+}
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model.ts
new file mode 100644
index 00000000000..fb7c826fc94
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model.ts
@@ -0,0 +1,29 @@
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Wrapper object for metadata patch Operations
+ * It should contain at least the operation type and metadata field. An abstract method to transform this object
+ * into a fast-json-patch Operation is defined in each instance extending from this.
+ */
+export abstract class MetadataPatchOperation {
+  /**
+   * The operation to perform
+   */
+  op: string;
+
+  /**
+   * The metadata field this operation is intended for
+   */
+  field: string;
+
+  constructor(op: string, field: string) {
+    this.op = op;
+    this.field = field;
+  }
+
+  /**
+   * Transform the MetadataPatchOperation into a fast-json-patch Operation by constructing its path and other properties
+   * using the information provided.
+   */
+  abstract toOperation(): Operation;
+}
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
new file mode 100644
index 00000000000..61fbae1980b
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
@@ -0,0 +1,27 @@
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Wrapper object for a metadata patch remove Operation
+ */
+export class MetadataPatchRemoveOperation extends MetadataPatchOperation {
+  static operationType = 'remove';
+
+  /**
+   * The place of the metadata value to remove within its field
+   */
+  place: number;
+
+  constructor(field: string, place: number) {
+    super(MetadataPatchRemoveOperation.operationType, field);
+    this.place = place;
+  }
+
+  /**
+   * Transform the MetadataPatchOperation into a fast-json-patch Operation by constructing its path and other properties
+   * using the information provided.
+   */
+  toOperation(): Operation {
+    return { op: this.op as any, path: `/metadata/${this.field}/${this.place}` };
+  }
+}
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
new file mode 100644
index 00000000000..e889bede0b7
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
@@ -0,0 +1,33 @@
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Wrapper object for a metadata patch replace Operation
+ */
+export class MetadataPatchReplaceOperation extends MetadataPatchOperation {
+  static operationType = 'replace';
+
+  /**
+   * The place of the metadata value within its field to modify
+   */
+  place: number;
+
+  /**
+   * The new value to replace the metadata with
+   */
+  value: any;
+
+  constructor(field: string, place: number, value: any) {
+    super(MetadataPatchReplaceOperation.operationType, field);
+    this.place = place;
+    this.value = value;
+  }
+
+  /**
+   * Transform the MetadataPatchOperation into a fast-json-patch Operation by constructing its path and other properties
+   * using the information provided.
+   */
+  toOperation(): Operation {
+    return { op: this.op as any, path: `/metadata/${this.field}/${this.place}`, value: this.value };
+  }
+}
diff --git a/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts b/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
new file mode 100644
index 00000000000..7c67f9a2e55
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
@@ -0,0 +1,15 @@
+import { FieldUpdates } from '../object-updates.reducer';
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Interface for a service dealing with the transformations of patch operations from the object-updates store
+ * The implementations of this service know how to deal with the fields of a FieldUpdate and how to transform them
+ * into patch Operations.
+ */
+export interface PatchOperationService {
+  /**
+   * Transform a {@link FieldUpdates} object into an array of fast-json-patch Operations
+   * @param fieldUpdates
+   */
+  fieldUpdatesToPatchOperations(fieldUpdates: FieldUpdates): Operation[];
+}
diff --git a/src/app/core/data/paginated-list.model.ts b/src/app/core/data/paginated-list.model.ts
new file mode 100644
index 00000000000..4f9b4c4a763
--- /dev/null
+++ b/src/app/core/data/paginated-list.model.ts
@@ -0,0 +1,199 @@
+import { PageInfo } from '../shared/page-info.model';
+import { hasValue, isEmpty, hasNoValue, isUndefined } from '../../shared/empty.util';
+import { HALResource } from '../shared/hal-resource.model';
+import { HALLink } from '../shared/hal-link.model';
+import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { PAGINATED_LIST } from './paginated-list.resource-type';
+import { ResourceType } from '../shared/resource-type';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { autoserialize, deserialize } from 'cerialize';
+
+/**
+ * Factory function for a paginated list
+ *
+ * @param pageInfo    The PageInfo for the new PaginatedList
+ * @param page        The list of objects on the current page
+ * @param normalized  Set to true if the list should only contain the links to the page objects,
+ *                    not the objects themselves
+ * @param _links      Optional HALLinks to attach to the new PaginatedList
+ */
+export const buildPaginatedList = <T>(pageInfo: PageInfo, page: T[], normalized = false, _links?: { [k: string]: HALLink | HALLink[] }): PaginatedList<T> => {
+  const result = new PaginatedList<T>();
+
+  if (hasNoValue(pageInfo)) {
+    pageInfo = new PageInfo();
+  }
+
+  result.pageInfo = pageInfo;
+
+  let pageLinks: HALLink[];
+  if (isEmpty(page)) {
+    pageLinks = [];
+  } else {
+    pageLinks = page.map((element: any) => {
+      if (hasValue(element) && hasValue(element._links) && hasValue(element._links.self)) {
+        return (element as HALResource)._links.self;
+      } else {
+        return null;
+      }
+    })
+    // if none of the objects in page are HALResources, don't set a page link
+    if (pageLinks.every((link: HALLink) => hasNoValue(link))) {
+      pageLinks = undefined;
+    }
+  }
+
+  result._links = Object.assign({}, _links, pageInfo._links, {
+    page: pageLinks
+  });
+
+  if (!normalized || isUndefined(pageLinks)) {
+    result.page = page;
+  }
+
+  return result;
+};
+
+@typedObject
+export class PaginatedList<T> extends CacheableObject {
+
+  static type = PAGINATED_LIST;
+
+  /**
+   * The type of the list
+   */
+  @excludeFromEquals
+  type = PAGINATED_LIST;
+
+  /**
+   * The type of objects in the list
+   */
+  @autoserialize
+  objectType?: ResourceType
+
+  /**
+   * The list of objects that represents the current page
+   */
+  page?: T[];
+
+  /**
+   * the {@link PageInfo} object
+   */
+  @autoserialize
+  pageInfo?: PageInfo;
+
+  /**
+   * The {@link HALLink}s for this PaginatedList
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+    page: HALLink[];
+    first?: HALLink;
+    prev?: HALLink;
+    next?: HALLink;
+    last?: HALLink;
+  };
+
+  get elementsPerPage(): number {
+    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.elementsPerPage)) {
+      return this.pageInfo.elementsPerPage;
+    }
+    return this.getPageLength();
+  }
+
+  set elementsPerPage(value: number) {
+    this.pageInfo.elementsPerPage = value;
+  }
+
+  get totalElements(): number {
+    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.totalElements)) {
+      return this.pageInfo.totalElements;
+    }
+    return this.getPageLength();
+  }
+
+  set totalElements(value: number) {
+    this.pageInfo.totalElements = value;
+  }
+
+  get totalPages(): number {
+    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.totalPages)) {
+      return this.pageInfo.totalPages;
+    }
+    return 1;
+  }
+
+  set totalPages(value: number) {
+    this.pageInfo.totalPages = value;
+  }
+
+  get currentPage(): number {
+    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.currentPage)) {
+      return this.pageInfo.currentPage;
+    }
+    return 1;
+  }
+
+  set currentPage(value: number) {
+    this.pageInfo.currentPage = value;
+  }
+
+  get first(): string {
+    if (hasValue(this._links.first) && hasValue(this._links.first.href)) {
+      return this._links.first.href;
+    }
+  }
+
+  set first(first: string) {
+    this._links.first = { href: first };
+    this.pageInfo._links.first = { href: first };
+  }
+
+  get prev(): string {
+    if (hasValue(this._links.prev) && hasValue(this._links.prev.href)) {
+      return this._links.prev.href;
+    }
+  }
+
+  set prev(prev: string) {
+    this._links.prev = { href: prev };
+    this.pageInfo._links.prev = { href: prev };
+  }
+
+  get next(): string {
+    if (hasValue(this._links.next) && hasValue(this._links.next.href)) {
+      return this._links.next.href;
+    }
+  }
+
+  set next(next: string) {
+    this._links.next = { href: next };
+    this.pageInfo._links.next = { href: next };
+  }
+
+  get last(): string {
+    if (hasValue(this._links.last) && hasValue(this._links.last.href)) {
+      return this._links.last.href;
+    }
+  }
+
+  set last(last: string) {
+    this._links.last = { href: last };
+    this.pageInfo._links.last = { href: last };
+  }
+
+  get self(): string {
+    return this._links.self.href;
+  }
+
+  set self(self: string) {
+    this._links.self = { href: self };
+    this.pageInfo._links.self = { href: self };
+  }
+
+  protected getPageLength() {
+    return (Array.isArray(this.page)) ? this.page.length : 0;
+  }
+}
diff --git a/src/app/core/data/paginated-list.resource-type.ts b/src/app/core/data/paginated-list.resource-type.ts
new file mode 100644
index 00000000000..e58b6cc95d8
--- /dev/null
+++ b/src/app/core/data/paginated-list.resource-type.ts
@@ -0,0 +1,3 @@
+import { ResourceType } from '../shared/resource-type';
+
+export const PAGINATED_LIST = new ResourceType('paginated-list');
diff --git a/src/app/core/data/paginated-list.ts b/src/app/core/data/paginated-list.ts
deleted file mode 100644
index 9f05ca78890..00000000000
--- a/src/app/core/data/paginated-list.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { hasValue } from '../../shared/empty.util';
-
-export class PaginatedList<T> {
-
-  constructor(public pageInfo: PageInfo,
-              public page: T[]) {
-  }
-
-  get elementsPerPage(): number {
-    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.elementsPerPage)) {
-      return this.pageInfo.elementsPerPage;
-    }
-    return this.getPageLength();
-  }
-
-  set elementsPerPage(value: number) {
-    this.pageInfo.elementsPerPage = value;
-  }
-
-  get totalElements(): number {
-    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.totalElements)) {
-      return this.pageInfo.totalElements;
-    }
-    return this.getPageLength();
-  }
-
-  set totalElements(value: number) {
-    this.pageInfo.totalElements = value;
-  }
-
-  get totalPages(): number {
-    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.totalPages)) {
-      return this.pageInfo.totalPages;
-    }
-    return 1;
-  }
-
-  set totalPages(value: number) {
-    this.pageInfo.totalPages = value;
-  }
-
-  get currentPage(): number {
-    if (hasValue(this.pageInfo) && hasValue(this.pageInfo.currentPage)) {
-      return this.pageInfo.currentPage;
-    }
-    return 1;
-  }
-
-  set currentPage(value: number) {
-    this.pageInfo.currentPage = value;
-  }
-
-  get first(): string {
-    return this.pageInfo.first;
-  }
-
-  set first(first: string) {
-    this.pageInfo._links.first = { href: first };
-  }
-
-  get prev(): string {
-    return this.pageInfo.prev;
-  }
-  set prev(prev: string) {
-    this.pageInfo._links.prev = { href: prev };
-  }
-
-  get next(): string {
-    return this.pageInfo.next;
-  }
-
-  set next(next: string) {
-    this.pageInfo._links.next = { href: next };
-  }
-
-  get last(): string {
-    return this.pageInfo.last;
-  }
-
-  set last(last: string) {
-    this.pageInfo._links.last = { href: last };
-  }
-
-  get self(): string {
-    return this.pageInfo.self;
-  }
-
-  set self(self: string) {
-    this.pageInfo._links.self = { href: self };
-  }
-
-  protected getPageLength() {
-    return (Array.isArray(this.page)) ? this.page.length : 0;
-  }
-}
diff --git a/src/app/core/data/parsing.service.ts b/src/app/core/data/parsing.service.ts
index ea8d1ea8101..bebbd63fd79 100644
--- a/src/app/core/data/parsing.service.ts
+++ b/src/app/core/data/parsing.service.ts
@@ -1,7 +1,7 @@
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { RestRequest } from './request.models';
-import { RestResponse } from '../cache/response.models';
+import { ParsedResponse } from '../cache/response.models';
 
 export interface ResponseParsingService {
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse;
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse;
 }
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
new file mode 100644
index 00000000000..687ed8c1e4e
--- /dev/null
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -0,0 +1,67 @@
+import { Injectable } from '@angular/core';
+import { DataService } from '../data.service';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
+import { Process } from '../../../process-page/processes/process.model';
+import { dataService } from '../../cache/builders/build-decorators';
+import { PROCESS } from '../../../process-page/processes/process.resource-type';
+import { Observable } from 'rxjs/internal/Observable';
+import { switchMap, take } from 'rxjs/operators';
+import { GetRequest } from '../request.models';
+import { PaginatedList } from '../paginated-list.model';
+import { Bitstream } from '../../shared/bitstream.model';
+import { RemoteData } from '../remote-data';
+import { isNotEmptyOperator } from '../../../shared/empty.util';
+
+@Injectable()
+@dataService(PROCESS)
+export class ProcessDataService extends DataService<Process> {
+  protected linkPath = 'processes';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<Process>) {
+    super();
+  }
+
+  /**
+   * Get the endpoint for a process his files
+   * @param processId The ID of the process
+   */
+  getFilesEndpoint(processId: string): Observable<string> {
+    return this.getBrowseEndpoint().pipe(
+      switchMap((href) => this.halService.getEndpoint('files', `${href}/${processId}`))
+    );
+  }
+
+  /**
+   * Get a process his output files
+   * @param processId The ID of the process
+   */
+  getFiles(processId: string): Observable<RemoteData<PaginatedList<Bitstream>>> {
+    const href$ = this.getFilesEndpoint(processId).pipe(
+      isNotEmptyOperator(),
+      take(1)
+    );
+
+    href$.subscribe((href: string) => {
+      const request = new GetRequest(this.requestService.generateRequestId(), href);
+      this.requestService.configure(request);
+    });
+
+    return this.rdbService.buildList(href$);
+  }
+}
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
new file mode 100644
index 00000000000..911e2d0890f
--- /dev/null
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -0,0 +1,65 @@
+import { Injectable } from '@angular/core';
+import { DataService } from '../data.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
+import { Script } from '../../../process-page/scripts/script.model';
+import { ProcessParameter } from '../../../process-page/processes/process-parameter.model';
+import { map, take } from 'rxjs/operators';
+import { URLCombiner } from '../../url-combiner/url-combiner';
+import { RemoteData } from '../remote-data';
+import { MultipartPostRequest, RestRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { Observable } from 'rxjs';
+import { dataService } from '../../cache/builders/build-decorators';
+import { SCRIPT } from '../../../process-page/scripts/script.resource-type';
+import { Process } from '../../../process-page/processes/process.model';
+
+export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import';
+export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
+
+@Injectable()
+@dataService(SCRIPT)
+export class ScriptDataService extends DataService<Script> {
+  protected linkPath = 'scripts';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<Script>) {
+    super();
+  }
+
+  public invoke(scriptName: string, parameters: ProcessParameter[], files: File[]): Observable<RemoteData<Process>> {
+    const requestId = this.requestService.generateRequestId();
+    this.getBrowseEndpoint().pipe(
+      take(1),
+      map((endpoint: string) => new URLCombiner(endpoint, scriptName, 'processes').toString()),
+      map((endpoint: string) => {
+        const body = this.getInvocationFormData(parameters, files);
+        return new MultipartPostRequest(requestId, endpoint, body)
+      })
+    ).subscribe((request: RestRequest) => this.requestService.configure(request));
+
+    return this.rdbService.buildFromRequestUUID<Process>(requestId);
+  }
+
+  private getInvocationFormData(parameters: ProcessParameter[], files: File[]): FormData {
+    const form: FormData = new FormData();
+    form.set('properties', JSON.stringify(parameters));
+    files.forEach((file: File) => {
+      form.append('file', file);
+    });
+    return form;
+  }
+}
diff --git a/src/app/core/data/registration-response-parsing.service.spec.ts b/src/app/core/data/registration-response-parsing.service.spec.ts
new file mode 100644
index 00000000000..1f69ed9705e
--- /dev/null
+++ b/src/app/core/data/registration-response-parsing.service.spec.ts
@@ -0,0 +1,22 @@
+import { Registration } from '../shared/registration.model';
+import { RegistrationResponseParsingService } from './registration-response-parsing.service';
+import { ParsedResponse } from '../cache/response.models';
+
+describe('RegistrationResponseParsingService', () => {
+  describe('parse', () => {
+    const registration = Object.assign(new Registration(), {email: 'test@email.org', token: 'test-token'});
+    const registrationResponseParsingService = new RegistrationResponseParsingService();
+
+    const data = {
+      payload: {email: 'test@email.org', token: 'test-token'},
+      statusCode: 200,
+      statusText: 'Success'
+    };
+
+    it('should parse a registration response', () => {
+      const expected = registrationResponseParsingService.parse({} as any, data);
+
+      expect(expected).toEqual(new ParsedResponse(200, undefined, registration));
+    });
+  });
+});
diff --git a/src/app/core/data/registration-response-parsing.service.ts b/src/app/core/data/registration-response-parsing.service.ts
new file mode 100644
index 00000000000..e11838e0ac7
--- /dev/null
+++ b/src/app/core/data/registration-response-parsing.service.ts
@@ -0,0 +1,26 @@
+import { Injectable } from '@angular/core';
+import {
+  ParsedResponse
+} from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './request.models';
+import { Registration } from '../shared/registration.model';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Parsing service responsible for parsing a Registration response
+ */
+export class RegistrationResponseParsingService implements ResponseParsingService {
+
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
+    const payload = data.payload;
+
+    const registration = Object.assign(new Registration(), payload);
+
+    return new ParsedResponse(data.statusCode, undefined, registration);
+  }
+
+}
diff --git a/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts b/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts
deleted file mode 100644
index 6cc031f3c92..00000000000
--- a/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import {
-  RegistryBitstreamformatsSuccessResponse
-} from '../cache/response.models';
-import { RegistryBitstreamformatsResponseParsingService } from './registry-bitstreamformats-response-parsing.service';
-
-describe('RegistryBitstreamformatsResponseParsingService', () => {
-  let service: RegistryBitstreamformatsResponseParsingService;
-
-  const mockDSOParser = Object.assign({
-    processPageInfo: () => new PageInfo()
-  }) as DSOResponseParsingService;
-
-  const data = Object.assign({
-    payload: {
-      _embedded: {
-        bitstreamformats: [
-          {
-            uuid: 'uuid-1',
-            description: 'a description'
-          },
-          {
-            uuid: 'uuid-2',
-            description: 'another description'
-          },
-        ]
-      }
-    }
-  }) as DSpaceRESTV2Response;
-
-  beforeEach(() => {
-    service = new RegistryBitstreamformatsResponseParsingService(mockDSOParser);
-  });
-
-  it('should parse the data correctly', () => {
-    const response = service.parse(null, data);
-    expect(response.constructor).toBe(RegistryBitstreamformatsSuccessResponse);
-  });
-});
diff --git a/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts b/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts
deleted file mode 100644
index 1cbcf358e34..00000000000
--- a/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { RegistryBitstreamformatsSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class RegistryBitstreamformatsResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    const bitstreamformats = payload._embedded.bitstreamformats;
-    payload.bitstreamformats = bitstreamformats;
-
-    const deserialized = new DSpaceSerializer(RegistryBitstreamformatsResponse).deserialize(payload);
-    return new RegistryBitstreamformatsSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(data.payload.page));
-  }
-
-}
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts
deleted file mode 100644
index 5ede21954a3..00000000000
--- a/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import {
-  RegistryMetadatafieldsSuccessResponse
-} from '../cache/response.models';
-import { RegistryMetadatafieldsResponseParsingService } from './registry-metadatafields-response-parsing.service';
-
-describe('RegistryMetadatafieldsResponseParsingService', () => {
-  let service: RegistryMetadatafieldsResponseParsingService;
-
-  const mockDSOParser = Object.assign({
-    processPageInfo: () => new PageInfo()
-  }) as DSOResponseParsingService;
-
-  const data = Object.assign({
-    payload: {
-      _embedded: {
-        metadatafields: [
-          {
-            id: 1,
-            element: 'element',
-            qualifier: 'qualifier',
-            scopeNote: 'a scope note',
-            _embedded: {
-              schema: {
-                id: 1,
-                prefix: 'test',
-                namespace: 'test namespace'
-              }
-            }
-          },
-          {
-            id: 2,
-            element: 'secondelement',
-            qualifier: 'secondqualifier',
-            scopeNote: 'a second scope note',
-            _embedded: {
-              schema: {
-                id: 1,
-                prefix: 'test',
-                namespace: 'test namespace'
-              }
-            }
-          },
-        ]
-      }
-    }
-  }) as DSpaceRESTV2Response;
-
-  const emptyData = Object.assign({
-    payload: {}
-  }) as DSpaceRESTV2Response;
-
-  beforeEach(() => {
-    service = new RegistryMetadatafieldsResponseParsingService(mockDSOParser);
-  });
-
-  it('should parse the data correctly', () => {
-    const response = service.parse(null, data);
-    expect(response.constructor).toBe(RegistryMetadatafieldsSuccessResponse);
-  });
-
-  it('should not produce an error and parse the data correctly when the data is empty', () => {
-    const response = service.parse(null, emptyData);
-    expect(response.constructor).toBe(RegistryMetadatafieldsSuccessResponse);
-  });
-});
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
deleted file mode 100644
index cf9484c4c4a..00000000000
--- a/src/app/core/data/registry-metadatafields-response-parsing.service.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Injectable } from '@angular/core';
-import { hasValue } from '../../shared/empty.util';
-import { RegistryMetadatafieldsSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class RegistryMetadatafieldsResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    let metadatafields = [];
-
-    if (hasValue(payload._embedded)) {
-      metadatafields = payload._embedded.metadatafields;
-      metadatafields.forEach((field) => {
-        field.schema = field._embedded.schema;
-      });
-    }
-
-    payload.metadatafields = metadatafields;
-
-    const deserialized = new DSpaceSerializer(RegistryMetadatafieldsResponse).deserialize(payload);
-    return new RegistryMetadatafieldsSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(data.payload));
-  }
-
-}
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts
deleted file mode 100644
index e49305d06af..00000000000
--- a/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { RegistryMetadataschemasResponseParsingService } from './registry-metadataschemas-response-parsing.service';
-import { PageInfo } from '../shared/page-info.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { RegistryMetadataschemasSuccessResponse } from '../cache/response.models';
-
-describe('RegistryMetadataschemasResponseParsingService', () => {
-  let service: RegistryMetadataschemasResponseParsingService;
-
-  const mockDSOParser = Object.assign({
-    processPageInfo: () => new PageInfo()
-  }) as DSOResponseParsingService;
-
-  const data = Object.assign({
-    payload: {
-      _embedded: {
-        metadataschemas: [
-          {
-            id: 1,
-            prefix: 'test',
-            namespace: 'test namespace'
-          },
-          {
-            id: 2,
-            prefix: 'second',
-            namespace: 'second test namespace'
-          }
-        ]
-      }
-    }
-  }) as DSpaceRESTV2Response;
-
-  const emptyData = Object.assign({
-    payload: {}
-  }) as DSpaceRESTV2Response;
-
-  beforeEach(() => {
-    service = new RegistryMetadataschemasResponseParsingService(mockDSOParser);
-  });
-
-  it('should parse the data correctly', () => {
-    const response = service.parse(null, data);
-    expect(response.constructor).toBe(RegistryMetadataschemasSuccessResponse);
-  });
-
-  it('should not produce an error and parse the data correctly when the data is empty', () => {
-    const response = service.parse(null, emptyData);
-    expect(response.constructor).toBe(RegistryMetadataschemasSuccessResponse);
-  });
-});
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
deleted file mode 100644
index 416ed19dc26..00000000000
--- a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable } from '@angular/core';
-import { hasValue } from '../../shared/empty.util';
-import { RegistryMetadataschemasSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class RegistryMetadataschemasResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    let metadataschemas = [];
-    if (hasValue(payload._embedded)) {
-      metadataschemas = payload._embedded.metadataschemas;
-    }
-    payload.metadataschemas = metadataschemas;
-
-    const deserialized = new DSpaceSerializer(RegistryMetadataschemasResponse).deserialize(payload);
-    return new RegistryMetadataschemasSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(data.payload));
-  }
-
-}
diff --git a/src/app/core/data/relationship-type.service.spec.ts b/src/app/core/data/relationship-type.service.spec.ts
index 751d28bf903..e48ffccbc21 100644
--- a/src/app/core/data/relationship-type.service.spec.ts
+++ b/src/app/core/data/relationship-type.service.spec.ts
@@ -7,7 +7,7 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { PageInfo } from '../shared/page-info.model';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList, buildPaginatedList } from './paginated-list.model';
 import { RelationshipTypeService } from './relationship-type.service';
 import { RequestService } from './request.service';
 
@@ -59,7 +59,7 @@ describe('RelationshipTypeService', () => {
       rightType: createSuccessfulRemoteDataObject$(orgUnitType)
     });
 
-    buildList = createSuccessfulRemoteDataObject(new PaginatedList(new PageInfo(), [relationshipType1, relationshipType2]));
+    buildList = createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), [relationshipType1, relationshipType2]));
     rdbService = getMockRemoteDataBuildService(undefined, observableOf(buildList));
     objectCache = Object.assign({
       /* tslint:disable:no-empty */
diff --git a/src/app/core/data/relationship-type.service.ts b/src/app/core/data/relationship-type.service.ts
index eefe663209b..e8a1e047dd0 100644
--- a/src/app/core/data/relationship-type.service.ts
+++ b/src/app/core/data/relationship-type.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
-import { filter, find, map, switchMap } from 'rxjs/operators';
+import { filter, find, map, mergeMap, switchMap } from 'rxjs/operators';
 import { AppState } from '../../app.reducer';
 import { isNotUndefined } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -16,11 +16,11 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { RELATIONSHIP_TYPE } from '../shared/item-relationships/relationship-type.resource-type';
-import { configureRequest, getSucceededRemoteData } from '../shared/operators';
+import { configureRequest, getFirstSucceededRemoteData } from '../shared/operators';
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { ItemDataService } from './item-data.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { FindListOptions, FindListRequest } from './request.models';
 import { RequestService } from './request.service';
@@ -73,10 +73,10 @@ export class RelationshipTypeService extends DataService<RelationshipType> {
   getRelationshipTypeByLabelAndTypes(label: string, firstType: string, secondType: string): Observable<RelationshipType> {
     return this.getAllRelationshipTypes({ currentPage: 1, elementsPerPage: Number.MAX_VALUE })
       .pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         /* Flatten the page so we can treat it like an observable */
         switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
-        switchMap((type: RelationshipType) => {
+        mergeMap((type: RelationshipType) => {
           if (type.leftwardType === label) {
             return this.checkType(type, firstType, secondType);
           } else if (type.rightwardType === label) {
@@ -92,7 +92,7 @@ export class RelationshipTypeService extends DataService<RelationshipType> {
   // returns a void observable if there's not match
   // returns an observable that emits the relationship type when there is a match
   private checkType(type: RelationshipType, firstType: string, secondType: string): Observable<RelationshipType> {
-    const entityTypes = observableCombineLatest(type.leftType.pipe(getSucceededRemoteData()), type.rightType.pipe(getSucceededRemoteData()));
+    const entityTypes = observableCombineLatest([type.leftType.pipe(getFirstSucceededRemoteData()), type.rightType.pipe(getFirstSucceededRemoteData())]);
     return entityTypes.pipe(
       find(([leftTypeRD, rightTypeRD]: [RemoteData<ItemType>, RemoteData<ItemType>]) => leftTypeRD.payload.label === firstType && rightTypeRD.payload.label === secondType),
       filter((types) => isNotUndefined(types)),
diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts
index c8ce2c5c457..22b3677459b 100644
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -1,23 +1,24 @@
-import { Observable } from 'rxjs/internal/Observable';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import * as ItemRelationshipsUtils from '../../+item-page/simple/item-types/shared/item-relationships-utils';
-import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { spyOnOperator } from '../../shared/testing/utils.test';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { Relationship } from '../shared/item-relationships/relationship.model';
 import { Item } from '../shared/item.model';
 import { PageInfo } from '../shared/page-info.model';
-import { PaginatedList } from './paginated-list';
-import { RelationshipService } from './relationship.service';
-import { RemoteData } from './remote-data';
+import { buildPaginatedList } from './paginated-list.model';
 import { DeleteRequest, FindListOptions } from './request.models';
-import { RequestEntry } from './request.reducer';
+import { RelationshipService } from './relationship.service';
 import { RequestService } from './request.service';
+import { RequestEntry } from './request.reducer';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createPaginatedList, spyOnOperator } from '../../shared/testing/utils.test';
 
 describe('RelationshipService', () => {
   let service: RelationshipService;
@@ -52,7 +53,7 @@ describe('RelationshipService', () => {
     },
     id: '2',
     uuid: '2',
-    relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+    relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
   });
   const relationship2 = Object.assign(new Relationship(), {
     _links: {
@@ -68,13 +69,14 @@ describe('RelationshipService', () => {
     },
     id: '3',
     uuid: '3',
-    relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+    relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
   });
 
-  const relationships = [relationship1, relationship2];  const item = Object.assign(new Item(), {
+  const relationships = [relationship1, relationship2];
+  const item = Object.assign(new Item(), {
     id: 'publication',
     uuid: 'publication',
-    relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships))),
+    relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
     _links: {
       relationships: { href: restEndpointURL + '/publication/relationships' },
       self: { href: itemSelfLink }
@@ -96,25 +98,26 @@ describe('RelationshipService', () => {
     }
   });
 
-  relationship1.leftItem = getRemotedataObservable(relatedItem1);
-  relationship1.rightItem = getRemotedataObservable(item);
-  relationship2.leftItem = getRemotedataObservable(relatedItem2);
-  relationship2.rightItem = getRemotedataObservable(item);
+  relationship1.leftItem = createSuccessfulRemoteDataObject$(relatedItem1);
+  relationship1.rightItem = createSuccessfulRemoteDataObject$(item);
+  relationship2.leftItem = createSuccessfulRemoteDataObject$(relatedItem2);
+  relationship2.rightItem = createSuccessfulRemoteDataObject$(item);
   const relatedItems = [relatedItem1, relatedItem2];
 
-  const buildList$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [relatedItems]));
-  const relationships$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [relationships]));
+  const buildList$ = createSuccessfulRemoteDataObject$(createPaginatedList(relatedItems));
+  const relationships$ = createSuccessfulRemoteDataObject$(createPaginatedList(relationships));
   const rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, {'href': buildList$, 'https://rest.api/core/publication/relationships': relationships$});
   const objectCache = Object.assign({
     /* tslint:disable:no-empty */
     remove: () => {
     },
-    hasBySelfLinkObservable: () => observableOf(false)
+    hasBySelfLinkObservable: () => observableOf(false),
+    hasByHref$: () => observableOf(false)
     /* tslint:enable:no-empty */
   }) as ObjectCacheService;
 
   const itemService = jasmine.createSpyObj('itemService', {
-    findById: (uuid) => new RemoteData(false, false, true, undefined, relatedItems.find((relatedItem) => relatedItem.id === uuid)),
+    findById: (uuid) => createSuccessfulRemoteDataObject(relatedItems.find((relatedItem) => relatedItem.id === uuid)),
     findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
   });
 
@@ -146,7 +149,7 @@ describe('RelationshipService', () => {
 
   describe('deleteRelationship', () => {
     beforeEach(() => {
-      spyOn(service, 'findById').and.returnValue(getRemotedataObservable(relationship1));
+      spyOn(service, 'findById').and.returnValue(createSuccessfulRemoteDataObject$(relationship1));
       spyOn(objectCache, 'remove');
       service.deleteRelationship(relationships[0].uuid, 'right').subscribe();
     });
@@ -159,48 +162,15 @@ describe('RelationshipService', () => {
     it('should clear the cache of the related items', () => {
       expect(objectCache.remove).toHaveBeenCalledWith(relatedItem1._links.self.href);
       expect(objectCache.remove).toHaveBeenCalledWith(item._links.self.href);
-      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(relatedItem1.self);
-      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(item.self);
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(relatedItem1.uuid);
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(item.uuid);
     });
   });
 
   describe('getItemRelationshipsArray', () => {
     it('should return the item\'s relationships in the form of an array', (done) => {
       service.getItemRelationshipsArray(item).subscribe((result) => {
-        result.forEach((relResult: any) => {
-          expect(relResult).toEqual(relationships);
-        });
-        done();
-      });
-    });
-  });
-
-  describe('getRelatedItems', () => {
-    let mockItem;
-
-    beforeEach(() => {
-      mockItem = { uuid: 'someid' } as Item;
-
-      spyOn(service, 'getItemRelationshipsArray').and.returnValue(observableOf(relationships));
-
-      spyOnOperator(ItemRelationshipsUtils, 'relationsToItems').and.returnValue((v) => v);
-    });
-
-    it('should call getItemRelationshipsArray with the correct params', (done) => {
-      service.getRelatedItems(mockItem).subscribe(() => {
-        expect(service.getItemRelationshipsArray).toHaveBeenCalledWith(
-          mockItem,
-          followLink('leftItem'),
-          followLink('rightItem'),
-          followLink('relationshipType')
-        );
-        done();
-      });
-    });
-
-    it('should use the relationsToItems operator', (done) => {
-      service.getRelatedItems(mockItem).subscribe(() => {
-        expect(ItemRelationshipsUtils.relationsToItems).toHaveBeenCalledWith(mockItem.uuid);
+        expect(result).toEqual(relationships);
         done();
       });
     });
@@ -213,7 +183,7 @@ describe('RelationshipService', () => {
     let mockOptions;
 
     beforeEach(() => {
-      relationsList = new PaginatedList(new PageInfo({
+      relationsList = buildPaginatedList(new PageInfo({
         elementsPerPage: relationships.length,
         totalElements: relationships.length,
         currentPage: 1,
@@ -239,6 +209,7 @@ describe('RelationshipService', () => {
           mockItem,
           mockLabel,
           mockOptions,
+          true,
           followLink('leftItem'),
           followLink('rightItem'),
           followLink('relationshipType')
@@ -258,9 +229,4 @@ describe('RelationshipService', () => {
       });
     });
   })
-
 });
-
-function getRemotedataObservable(obj: any): Observable<RemoteData<any>> {
-  return observableOf(new RemoteData(false, false, true, undefined, obj));
-}
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index 4dde567c99d..2dff0d2a1f1 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -1,16 +1,30 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { MemoizedSelector, select, Store } from '@ngrx/store';
-import { combineLatest, combineLatest as observableCombineLatest } from 'rxjs';
+import { combineLatest as observableCombineLatest } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
-import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap
+} from 'rxjs/operators';
 import {
   compareArraysUsingIds,
   paginatedRelationsToItems,
   relationsToItems
 } from '../../+item-page/simple/item-types/shared/item-relationships-utils';
 import { AppState, keySelector } from '../../app.reducer';
-import { hasValue, hasValueOperator, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+  isNotEmptyOperator
+} from '../../shared/empty.util';
 import { ReorderableRelationship } from '../../shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import {
   RemoveNameVariantAction,
@@ -21,11 +35,10 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core.reducers';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { Relationship } from '../shared/item-relationships/relationship.model';
@@ -33,17 +46,20 @@ import { RELATIONSHIP } from '../shared/item-relationships/relationship.resource
 import { Item } from '../shared/item.model';
 import {
   configureRequest,
+  getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
-  getResponseFromEntry,
-  getSucceededRemoteData
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
 } from '../shared/operators';
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { ItemDataService } from './item-data.service';
-import { PaginatedList } from './paginated-list';
-import { RemoteData, RemoteDataState } from './remote-data';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
 import { DeleteRequest, FindListOptions, PostRequest, RestRequest } from './request.models';
 import { RequestService } from './request.service';
+import { RequestEntryState } from './request.reducer';
+import { NoContent } from '../shared/NoContent.model';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -55,6 +71,19 @@ const relationshipStateSelector = (listID: string, itemID: string): MemoizedSele
   return keySelector<string>(itemID, relationshipListStateSelector(listID));
 };
 
+/**
+ * Return true if the Item in the payload of the source observable matches
+ * the given Item by UUID
+ *
+ * @param itemCheck the Item to compare with
+ */
+const compareItemsByUUID = (itemCheck: Item) =>
+  (source: Observable<RemoteData<Item>>): Observable<boolean> =>
+    source.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((item: Item) => item.uuid === itemCheck.uuid)
+    );
+
 /**
  * The service handling all relationship requests
  */
@@ -62,6 +91,7 @@ const relationshipStateSelector = (listID: string, itemID: string): MemoizedSele
 @dataService(RELATIONSHIP)
 export class RelationshipService extends DataService<Relationship> {
   protected linkPath = 'relationships';
+  protected responseMsToLive = 15 * 60 * 1000;
 
   constructor(protected itemService: ItemDataService,
               protected requestService: RequestService,
@@ -90,7 +120,7 @@ export class RelationshipService extends DataService<Relationship> {
    * Send a delete request for a relationship by ID
    * @param id
    */
-  deleteRelationship(id: string, copyVirtualMetadata: string): Observable<RestResponse> {
+  deleteRelationship(id: string, copyVirtualMetadata: string): Observable<RemoteData<NoContent>> {
     return this.getRelationshipEndpoint(id).pipe(
       isNotEmptyOperator(),
       take(1),
@@ -99,13 +129,9 @@ export class RelationshipService extends DataService<Relationship> {
         new DeleteRequest(this.requestService.generateRequestId(), endpointURL + '?copyVirtualMetadata=' + copyVirtualMetadata)
       ),
       configureRequest(this.requestService),
-      switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
-      getResponseFromEntry(),
-      switchMap((response) =>
-        this.clearRelatedCache(id).pipe(
-          map(() => response),
-        )
-      ),
+      switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
+      getFirstCompletedRemoteData(),
+      tap(() => this.refreshRelationshipItemsInCacheByRelationship(id)),
     );
   }
 
@@ -117,7 +143,7 @@ export class RelationshipService extends DataService<Relationship> {
    * @param leftwardValue The leftward value of the relationship
    * @param rightwardValue The rightward value of the relationship
    */
-  addRelationship(typeId: string, item1: Item, item2: Item, leftwardValue?: string, rightwardValue?: string): Observable<RestResponse> {
+  addRelationship(typeId: string, item1: Item, item2: Item, leftwardValue?: string, rightwardValue?: string): Observable<RemoteData<Relationship>> {
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'text/uri-list');
@@ -130,30 +156,30 @@ export class RelationshipService extends DataService<Relationship> {
       map((endpointUrl: string) => isNotEmpty(rightwardValue) ? `${endpointUrl}&rightwardValue=${rightwardValue}` : endpointUrl),
       map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, `${item1.self} \n ${item2.self}`, options)),
       configureRequest(this.requestService),
-      switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
-      getResponseFromEntry(),
-      tap(() => this.removeRelationshipItemsFromCache(item1)),
-      tap(() => this.removeRelationshipItemsFromCache(item2))
-    ) as Observable<RestResponse>;
+      switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
+      getFirstCompletedRemoteData(),
+      tap(() => this.refreshRelationshipItemsInCache(item1)),
+      tap(() => this.refreshRelationshipItemsInCache(item2)),
+    ) as Observable<RemoteData<Relationship>>;
   }
 
   /**
    * Method to remove two items of a relationship from the cache using the identifier of the relationship
    * @param relationshipId The identifier of the relationship
    */
-  private removeRelationshipItemsFromCacheByRelationship(relationshipId: string) {
-    this.findById(relationshipId).pipe(
-      getSucceededRemoteData(),
+  private refreshRelationshipItemsInCacheByRelationship(relationshipId: string) {
+    this.findById(relationshipId, false, followLink('leftItem'), followLink('rightItem')).pipe(
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      switchMap((rel: Relationship) => combineLatest(
-        rel.leftItem.pipe(getSucceededRemoteData(), getRemoteDataPayload()),
-        rel.rightItem.pipe(getSucceededRemoteData(), getRemoteDataPayload())
+      switchMap((rel: Relationship) => observableCombineLatest(
+        rel.leftItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload()),
+        rel.rightItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
         )
       ),
       take(1)
     ).subscribe(([item1, item2]) => {
-      this.removeRelationshipItemsFromCache(item1);
-      this.removeRelationshipItemsFromCache(item2);
+      this.refreshRelationshipItemsInCache(item1);
+      this.refreshRelationshipItemsInCache(item2);
     })
   }
 
@@ -161,13 +187,13 @@ export class RelationshipService extends DataService<Relationship> {
    * Method to remove an item that's part of a relationship from the cache
    * @param item The item to remove from the cache
    */
-  private removeRelationshipItemsFromCache(item) {
+  public refreshRelationshipItemsInCache(item) {
     this.objectCache.remove(item._links.self.href);
     this.requestService.removeByHrefSubstring(item.uuid);
-    combineLatest(
-      this.objectCache.hasBySelfLinkObservable(item._links.self.href),
-      this.requestService.hasByHrefObservable(item.uuid)
-    ).pipe(
+    observableCombineLatest([
+      this.objectCache.hasByHref$(item._links.self.href),
+      this.requestService.hasByHref$(item.self)
+    ]).pipe(
       filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
       take(1),
       switchMap(() => this.itemService.findByHref(item._links.self.href).pipe(take(1)))
@@ -176,11 +202,14 @@ export class RelationshipService extends DataService<Relationship> {
 
   /**
    * Get an item's relationships in the form of an array
-   * @param item
+   *
+   * @param item            The {@link Item} to get {@link Relationship}s for
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                        should be automatically resolved
    */
   getItemRelationshipsArray(item: Item, ...linksToFollow: Array<FollowLinkConfig<Relationship>>): Observable<Relationship[]> {
-    return this.findAllByHref(item._links.relationships.href, undefined, ...linksToFollow).pipe(
-      getSucceededRemoteData(),
+    return this.findAllByHref(item._links.relationships.href, undefined, false, ...linksToFollow).pipe(
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       map((rels: PaginatedList<Relationship>) => rels.page),
       hasValueOperator(),
@@ -202,10 +231,10 @@ export class RelationshipService extends DataService<Relationship> {
 
   private getRelationshipTypeLabelByRelationshipAndItem(relationship: Relationship, item: Item): Observable<string> {
     return relationship.leftItem.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((itemRD: RemoteData<Item>) => itemRD.payload),
       switchMap((otherItem: Item) => relationship.relationshipType.pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         map((relationshipTypeRD) => relationshipTypeRD.payload),
         map((relationshipType: RelationshipType) => {
           if (otherItem.uuid === item.uuid) {
@@ -241,7 +270,7 @@ export class RelationshipService extends DataService<Relationship> {
    * @param options
    */
   getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
-    return this.getItemRelationshipsByLabel(item, label, options, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')).pipe(paginatedRelationsToItems(item.uuid));
+    return this.getItemRelationshipsByLabel(item, label, options, true, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')).pipe(paginatedRelationsToItems(item.uuid));
   }
 
   /**
@@ -251,19 +280,23 @@ export class RelationshipService extends DataService<Relationship> {
    * @param item
    * @param label
    * @param options
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  getItemRelationshipsByLabel(item: Item, label: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<Relationship>>): Observable<RemoteData<PaginatedList<Relationship>>> {
+  getItemRelationshipsByLabel(item: Item, label: string, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Relationship>>): Observable<RemoteData<PaginatedList<Relationship>>> {
     let findListOptions = new FindListOptions();
     if (options) {
       findListOptions = Object.assign(new FindListOptions(), options);
     }
-    const searchParams = [new SearchParam('label', label), new SearchParam('dso', item.id)];
+    const searchParams = [new RequestParam('label', label), new RequestParam('dso', item.id)];
     if (findListOptions.searchParams) {
       findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
     } else {
       findListOptions.searchParams = searchParams;
     }
-    return this.searchBy('byLabel', findListOptions, ...linksToFollow);
+    return this.searchBy('byLabel', findListOptions, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -275,10 +308,10 @@ export class RelationshipService extends DataService<Relationship> {
   getRelationshipsByRelatedItemIds(item: Item, uuids: string[]): Observable<Relationship[]> {
     return this.getItemRelationshipsArray(item, followLink('leftItem'), followLink('rightItem')).pipe(
       switchMap((relationships: Relationship[]) => {
-        return observableCombineLatest(...relationships.map((relationship: Relationship) => {
+        return observableCombineLatest(relationships.map((relationship: Relationship) => {
           const isLeftItem$ = this.isItemInUUIDArray(relationship.leftItem, uuids);
           const isRightItem$ = this.isItemInUUIDArray(relationship.rightItem, uuids);
-          return observableCombineLatest(isLeftItem$, isRightItem$).pipe(
+          return observableCombineLatest([isLeftItem$, isRightItem$]).pipe(
             filter(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
             map(() => relationship),
             startWith(undefined)
@@ -291,7 +324,7 @@ export class RelationshipService extends DataService<Relationship> {
 
   private isItemInUUIDArray(itemRD$: Observable<RemoteData<Item>>, uuids: string[]) {
     return itemRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((itemRD: RemoteData<Item>) => itemRD.payload),
       map((item: Item) => uuids.includes(item.uuid))
     );
@@ -304,34 +337,32 @@ export class RelationshipService extends DataService<Relationship> {
    * @param label The rightward or leftward type of the relationship
    */
   getRelationshipByItemsAndLabel(item1: Item, item2: Item, label: string, options?: FindListOptions): Observable<Relationship> {
-    return this.getItemRelationshipsByLabel(item1, label, options, followLink('relationshipType'), followLink('leftItem'), followLink('rightItem'))
-      .pipe(
-        getSucceededRemoteData(),
-        isNotEmptyOperator(),
-        map((relationshipListRD: RemoteData<PaginatedList<Relationship>>) => relationshipListRD.payload.page),
-        mergeMap((relationships: Relationship[]) => {
-          return observableCombineLatest(...relationships.map((relationship: Relationship) => {
-            return observableCombineLatest(
-              this.isItemMatchWithItemRD(relationship.leftItem, item2),
-              this.isItemMatchWithItemRD(relationship.rightItem, item2)
-            ).pipe(
-              map(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
-              map((isMatch) => isMatch ? relationship : undefined)
-            );
-          }))
+    return this.getItemRelationshipsByLabel(
+      item1,
+      label,
+      options,
+      false,
+      followLink('relationshipType'),
+      followLink('leftItem'),
+      followLink('rightItem')
+    ).pipe(
+        getFirstSucceededRemoteData(),
+        // the mergemap below will emit all elements of the list as separate events
+        mergeMap((relationshipListRD: RemoteData<PaginatedList<Relationship>>) => relationshipListRD.payload.page),
+        mergeMap((relationship: Relationship) => {
+          return observableCombineLatest([
+            this.itemService.findByHref(relationship._links.leftItem.href).pipe(compareItemsByUUID(item2)),
+            this.itemService.findByHref(relationship._links.rightItem.href).pipe(compareItemsByUUID(item2))
+          ]).pipe(
+            map(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
+            map((isMatch) => isMatch ? relationship : undefined)
+          );
         }),
-        map((relationships: Relationship[]) => relationships.find(((relationship) => hasValue(relationship))))
+        filter((relationship) => hasValue(relationship)),
+        take(1)
       )
   }
 
-  private isItemMatchWithItemRD(itemRD$: Observable<RemoteData<Item>>, itemCheck: Item): Observable<boolean> {
-    return itemRD$.pipe(
-      getSucceededRemoteData(),
-      map((itemRD: RemoteData<Item>) => itemRD.payload),
-      map((item: Item) => item.uuid === itemCheck.uuid)
-    );
-  }
-
   /**
    * Method to set the name variant for specific list and item
    * @param listID The list for which to save the name variant
@@ -378,11 +409,11 @@ export class RelationshipService extends DataService<Relationship> {
    * @param nameVariant The name variant to set for the matching relationship
    */
   public updateNameVariant(item1: Item, item2: Item, relationshipLabel: string, nameVariant: string): Observable<RemoteData<Relationship>> {
-    const update$: Observable<RemoteData<Relationship>> = this.getRelationshipByItemsAndLabel(item1, item2, relationshipLabel)
+    return this.getRelationshipByItemsAndLabel(item1, item2, relationshipLabel)
       .pipe(
         switchMap((relation: Relationship) =>
           relation.relationshipType.pipe(
-            getSucceededRemoteData(),
+            getFirstSucceededRemoteData(),
             getRemoteDataPayload(),
             map((type) => {
               return { relation, type }
@@ -400,16 +431,20 @@ export class RelationshipService extends DataService<Relationship> {
           return this.update(updatedRelationship);
         }),
       );
+  }
 
-    update$.pipe(
-      filter((relationshipRD: RemoteData<Relationship>) => relationshipRD.state === RemoteDataState.RequestPending),
-      take(1),
-    ).subscribe(() => {
-      this.removeRelationshipItemsFromCache(item1);
-      this.removeRelationshipItemsFromCache(item2);
-    });
-
-    return update$
+  /**
+   * Check whether a given item is the left item of a given relationship, as an observable boolean
+   * @param relationship  the relationship for which to check whether the given item is the left item
+   * @param item          the item for which to check whether it is the left item of the given relationship
+   */
+  public isLeftItem(relationship: Relationship, item: Item): Observable<boolean> {
+    return relationship.leftItem.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      filter((leftItem: Item) => hasValue(leftItem) && isNotEmpty(leftItem.uuid)),
+      map((leftItem) => leftItem.uuid === item.uuid)
+    );
   }
 
   /**
@@ -428,11 +463,11 @@ export class RelationshipService extends DataService<Relationship> {
     const update$ = this.update(updatedRelationship);
 
     update$.pipe(
-      filter((relationshipRD: RemoteData<Relationship>) => relationshipRD.state === RemoteDataState.ResponsePending),
+      filter((relationshipRD: RemoteData<Relationship>) => relationshipRD.state === RequestEntryState.ResponsePending),
       take(1),
     ).subscribe((relationshipRD: RemoteData<Relationship>) => {
-      if (relationshipRD.state === RemoteDataState.ResponsePending) {
-        this.removeRelationshipItemsFromCacheByRelationship(reoRel.relationship.id);
+      if (relationshipRD.state === RequestEntryState.ResponsePending) {
+        this.refreshRelationshipItemsInCacheByRelationship(reoRel.relationship.id);
       }
     });
 
@@ -440,18 +475,11 @@ export class RelationshipService extends DataService<Relationship> {
   }
 
   /**
-   * Clear object and request caches of the items related to a relationship (left and right items)
-   * @param uuid  The uuid of the relationship for which to clear the related items from the cache
+   * Patch isn't supported on the relationship endpoint, so use put instead.
+   *
+   * @param object the {@link Relationship} to update
    */
-  clearRelatedCache(uuid: string): Observable<void> {
-    return this.findById(uuid).pipe(
-      getSucceededRemoteData(),
-      map((rd: RemoteData<Relationship>) => {
-        this.objectCache.remove(rd.payload._links.leftItem.href);
-        this.objectCache.remove(rd.payload._links.rightItem.href);
-        this.requestService.removeByHrefSubstring(rd.payload._links.leftItem.href);
-        this.requestService.removeByHrefSubstring(rd.payload._links.rightItem.href);
-      })
-    );
+  update(object: Relationship): Observable<RemoteData<Relationship>> {
+    return this.put(object);
   }
 }
diff --git a/src/app/core/data/remote-data-error.ts b/src/app/core/data/remote-data-error.ts
deleted file mode 100644
index 9291bc54474..00000000000
--- a/src/app/core/data/remote-data-error.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export class RemoteDataError {
-  constructor(
-    public statusCode: number,
-    public statusText: string,
-    public message: string
-  ) {
-  }
-}
diff --git a/src/app/core/data/remote-data.ts b/src/app/core/data/remote-data.ts
index 8502c8ba1da..4fa11607dff 100644
--- a/src/app/core/data/remote-data.ts
+++ b/src/app/core/data/remote-data.ts
@@ -1,58 +1,118 @@
-import { hasValue } from '../../shared/empty.util';
-import { RemoteDataError } from './remote-data-error';
-
-export enum RemoteDataState {
-  RequestPending = 'RequestPending',
-  ResponsePending = 'ResponsePending',
-  Failed = 'Failed',
-  Success = 'Success'
-}
+import {
+  RequestEntryState,
+  isStale,
+  hasCompleted,
+  hasSucceeded,
+  hasFailed,
+  isLoading,
+  isSuccessStale,
+  isErrorStale,
+  isSuccess,
+  isError,
+  isResponsePending,
+  isRequestPending
+} from './request.reducer';
 
 /**
  * A class to represent the state of a remote resource
  */
 export class RemoteData<T> {
   constructor(
-    private requestPending?: boolean,
-    private responsePending?: boolean,
-    private isSuccessful?: boolean,
-    public error?: RemoteDataError,
+    public timeCompleted: number,
+    public msToLive: number,
+    public lastUpdated: number,
+    public state: RequestEntryState,
+    public errorMessage?: string,
     public payload?: T,
     public statusCode?: number,
   ) {
   }
 
-  get state(): RemoteDataState {
-    if (this.isSuccessful === true && hasValue(this.payload)) {
-      return RemoteDataState.Success
-    } else if (this.isSuccessful === false) {
-      return RemoteDataState.Failed
-    } else if (this.requestPending === true) {
-      return RemoteDataState.RequestPending
-    } else {
-      return RemoteDataState.ResponsePending
-    }
-  }
-
+  /**
+   * Returns true if this.state is RequestPending, false otherwise
+   */
   get isRequestPending(): boolean {
-    return this.state === RemoteDataState.RequestPending;
+    return isRequestPending(this.state);
   }
 
+  /**
+   * Returns true if this.state is ResponsePending, false otherwise
+   */
   get isResponsePending(): boolean {
-    return this.state === RemoteDataState.ResponsePending;
+    return isResponsePending(this.state);
+  }
+
+  /**
+   * Returns true if this.state is Error, false otherwise
+   */
+  get isError(): boolean {
+    return isError(this.state);
+  }
+
+  /**
+   * Returns true if this.state is Success, false otherwise
+   *
+   */
+  get isSuccess(): boolean {
+    return isSuccess(this.state);
+  }
+
+  /**
+   * Returns true if this.state is ErrorStale, false otherwise
+   */
+  get isErrorStale(): boolean {
+    return isErrorStale(this.state);
   }
 
+  /**
+   * Returns true if this.state is SuccessStale, false otherwise
+   */
+  get isSuccessStale(): boolean {
+    return isSuccessStale(this.state);
+  }
+
+  /**
+   * Returns true if this.state is RequestPending or ResponsePending,
+   * false otherwise
+   */
   get isLoading(): boolean {
-    return this.state === RemoteDataState.RequestPending
-      || this.state === RemoteDataState.ResponsePending;
+    return isLoading(this.state);
   }
 
+  /**
+   * If this.isLoading is true, this method returns undefined, we can't know yet.
+   * If it isn't this method will return true if this.state is Error or ErrorStale,
+   * false otherwise
+   */
   get hasFailed(): boolean {
-    return this.state === RemoteDataState.Failed;
+    return hasFailed(this.state);
   }
 
+  /**
+   * If this.isLoading is true, this method returns undefined, we can't know yet.
+   * If it isn't this method will return true if this.state is Success or SuccessStale,
+   * false otherwise
+   */
   get hasSucceeded(): boolean {
-    return this.state === RemoteDataState.Success;
+    return hasSucceeded(this.state);
+  }
+
+  /**
+   * Returns true if this.state is not loading, false otherwise
+   */
+  get hasCompleted(): boolean {
+    return hasCompleted(this.state);
+  }
+
+  /**
+   * Returns true if this.state is SuccessStale or ErrorStale, false otherwise
+   */
+  get isStale(): boolean {
+    return isStale(this.state);
+  }
+
+  get hasNoContent(): boolean {
+    return this.statusCode === 204;
   }
 
 }
diff --git a/src/app/core/data/request.actions.ts b/src/app/core/data/request.actions.ts
index 2b2de135046..ceab188a8c6 100644
--- a/src/app/core/data/request.actions.ts
+++ b/src/app/core/data/request.actions.ts
@@ -1,7 +1,8 @@
 import { Action } from '@ngrx/store';
 import { type } from '../../shared/ngrx/type';
 import { RestRequest } from './request.models';
-import { RestResponse } from '../cache/response.models';
+import { HALLink } from '../shared/hal-link.model';
+import { UnCacheableObject } from '../shared/uncacheable-object.model';
 
 /**
  * The list of RequestAction type definitions
@@ -9,24 +10,36 @@ import { RestResponse } from '../cache/response.models';
 export const RequestActionTypes = {
   CONFIGURE: type('dspace/core/data/request/CONFIGURE'),
   EXECUTE: type('dspace/core/data/request/EXECUTE'),
-  COMPLETE: type('dspace/core/data/request/COMPLETE'),
+  SUCCESS: type('dspace/core/data/request/SUCCESS'),
+  ERROR: type('dspace/core/data/request/ERROR'),
+  STALE: type('dspace/core/data/request/STALE'),
   RESET_TIMESTAMPS: type('dspace/core/data/request/RESET_TIMESTAMPS'),
   REMOVE: type('dspace/core/data/request/REMOVE')
 };
 
 /* tslint:disable:max-classes-per-file */
-export class RequestConfigureAction implements Action {
+export abstract class RequestUpdateAction implements Action {
+  abstract type: string;
+  lastUpdated: number;
+
+  constructor() {
+    this.lastUpdated = new Date().getTime();
+  }
+}
+
+export class RequestConfigureAction extends RequestUpdateAction {
   type = RequestActionTypes.CONFIGURE;
   payload: RestRequest;
 
   constructor(
     request: RestRequest
   ) {
+    super();
     this.payload = request;
   }
 }
 
-export class RequestExecuteAction implements Action {
+export class RequestExecuteAction extends RequestUpdateAction {
   type = RequestActionTypes.EXECUTE;
   payload: string;
 
@@ -37,36 +50,107 @@ export class RequestExecuteAction implements Action {
    *    the request's uuid
    */
   constructor(uuid: string) {
+    super();
     this.payload = uuid
   }
 }
 
 /**
- * An ngrx action to indicate a response was returned
+ * An ngrx action to indicate a successful response was returned
  */
-export class RequestCompleteAction implements Action {
-  type = RequestActionTypes.COMPLETE;
+export class RequestSuccessAction extends RequestUpdateAction {
+  type = RequestActionTypes.SUCCESS;
   payload: {
     uuid: string,
-    response: RestResponse
+    timeCompleted: number,
+    statusCode: number,
+    link?: HALLink,
+    unCacheableObject?: UnCacheableObject
   };
 
   /**
-   * Create a new RequestCompleteAction
+   * Create a new RequestSuccessAction
    *
    * @param uuid
    *    the request's uuid
+   * @param statusCode
+   *    the statusCode of the response
+   * @param link
+   *    the HALlink to the object that was returned, and has been cached
+   * @param unCacheableObject
+   *    in case the REST API returns an object that can't be cached, because it doesn't have a self
+   *    link, provide it here
    */
-  constructor(uuid: string, response: RestResponse) {
+  constructor(uuid: string, statusCode: number, link?: HALLink, unCacheableObject?: UnCacheableObject) {
+    super();
+    this.payload = {
+      uuid,
+      timeCompleted: new Date().getTime(),
+      statusCode,
+      link,
+      unCacheableObject
+    };
+  }
+}
+
+/**
+ * An ngrx action to indicate an error response was returned
+ */
+export class RequestErrorAction extends RequestUpdateAction {
+  type = RequestActionTypes.ERROR;
+  payload: {
+    uuid: string,
+    timeCompleted: number,
+    statusCode: number,
+    errorMessage: string
+  };
+
+  /**
+   * Create a new RequestErrorAction
+   *
+   * @param uuid
+   *    the request's uuid
+   * @param statusCode
+   *    the statusCode of the response
+   * @param errorMessage
+   *    the error message in the response
+   */
+  constructor(uuid: string, statusCode: number, errorMessage: string) {
+    super();
+    this.payload = {
+      uuid,
+      timeCompleted: new Date().getTime(),
+      statusCode,
+      errorMessage
+    };
+  }
+}
+
+/**
+ * An ngrx action to indicate the response to this request is stale
+ */
+export class RequestStaleAction extends RequestUpdateAction {
+  type = RequestActionTypes.STALE;
+  payload: {
+    uuid: string,
+  };
+
+  /**
+   * Create a new RequestStaleAction
+   *
+   * @param uuid
+   *    the request's uuid
+   */
+  constructor(uuid: string) {
+    super();
     this.payload = {
       uuid,
-      response
     };
   }
 }
 
 /**
- * An ngrx action to reset the timeAdded property of all responses in the cached objects
+ * An ngrx action to reset the timeCompleted property of all responses in the cached objects
  */
 export class ResetResponseTimestampsAction implements Action {
   type = RequestActionTypes.RESET_TIMESTAMPS;
@@ -76,7 +160,7 @@ export class ResetResponseTimestampsAction implements Action {
    * Create a new ResetResponseTimestampsAction
    *
    * @param newTimestamp
-   *    the new timeAdded all objects should get
+   *    the new timeCompleted all objects should get
    */
   constructor(newTimestamp: number) {
     this.payload = newTimestamp;
@@ -109,6 +193,8 @@ export class RequestRemoveAction implements Action {
 export type RequestAction
   = RequestConfigureAction
   | RequestExecuteAction
-  | RequestCompleteAction
+  | RequestSuccessAction
+  | RequestErrorAction
+  | RequestStaleAction
   | ResetResponseTimestampsAction
   | RequestRemoveAction;
diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts
index 7f793f4ac4d..8bc8a0ed0b8 100644
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -1,33 +1,25 @@
-import { Inject, Injectable, Injector } from '@angular/core';
+import { Injectable, Injector } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
-import { Observable, of as observableOf } from 'rxjs';
 import { catchError, filter, flatMap, map, take } from 'rxjs/operators';
 
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { StoreActionTypes } from '../../store.actions';
 import { getClassForType } from '../cache/builders/build-decorators';
-import { ErrorResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 
-import { DSpaceRESTv2Service } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import {
   RequestActionTypes,
-  RequestCompleteAction,
   RequestExecuteAction,
-  ResetResponseTimestampsAction
+  ResetResponseTimestampsAction,
+  RequestSuccessAction,
+  RequestErrorAction
 } from './request.actions';
 import { RequestError, RestRequest } from './request.models';
 import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
-
-export const addToResponseCacheAndCompleteAction = (request: RestRequest) =>
-  (source: Observable<RestResponse>): Observable<RequestCompleteAction> =>
-    source.pipe(
-      map((response: RestResponse) => {
-        return new RequestCompleteAction(request.uuid, response);
-      })
-    );
+import { ParsedResponse } from '../cache/response.models';
 
 @Injectable()
 export class RequestEffects {
@@ -42,17 +34,23 @@ export class RequestEffects {
     filter((entry: RequestEntry) => hasValue(entry)),
     map((entry: RequestEntry) => entry.request),
     flatMap((request: RestRequest) => {
-      let body;
-      if (isNotEmpty(request.body)) {
+      let body = request.body;
+      if (isNotEmpty(request.body) && !request.isMultipart) {
         const serializer = new DSpaceSerializer(getClassForType(request.body.type));
         body = serializer.serialize(request.body);
       }
-      return this.restApi.request(request.method, request.href, body, request.options).pipe(
-        map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)),
-        addToResponseCacheAndCompleteAction(request),
-        catchError((error: RequestError) => observableOf(new ErrorResponse(error)).pipe(
-          addToResponseCacheAndCompleteAction(request)
-        ))
+      return this.restApi.request(request.method, request.href, body, request.options, request.isMultipart).pipe(
+        map((data: RawRestResponse) => this.injector.get(request.getResponseParser()).parse(request, data)),
+        map((response: ParsedResponse) => new RequestSuccessAction(request.uuid, response.statusCode, response.link, response.unCacheableObject)),
+        catchError((error: RequestError) => {
+          if (hasValue(error.statusCode)) {
+            // if it's an error returned by the server, complete the request
+            return [new RequestErrorAction(request.uuid, error.statusCode, error.message)];
+          } else {
+            // if it's a client side error, throw it
+            throw error;
+          }
+        })
       );
     })
   );
@@ -72,10 +70,9 @@ export class RequestEffects {
 
   constructor(
     private actions$: Actions,
-    private restApi: DSpaceRESTv2Service,
+    private restApi: DspaceRestService,
     private injector: Injector,
     protected requestService: RequestService
   ) { }
 
 }
-/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 06553335028..d027f5f79a9 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -1,37 +1,29 @@
 import { SortOptions } from '../cache/models/sort-options.model';
 import { GenericConstructor } from '../shared/generic-constructor';
-import { BrowseEntriesResponseParsingService } from './browse-entries-response-parsing.service';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
 import { ResponseParsingService } from './parsing.service';
 import { EndpointMapResponseParsingService } from './endpoint-map-response-parsing.service';
-import { BrowseResponseParsingService } from './browse-response-parsing.service';
-import { ConfigResponseParsingService } from '../config/config-response-parsing.service';
-import { AuthResponseParsingService } from '../auth/auth-response-parsing.service';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { SubmissionResponseParsingService } from '../submission/submission-response-parsing.service';
-import { IntegrationResponseParsingService } from '../integration/integration-response-parsing.service';
 import { RestRequestMethod } from './rest-request-method';
-import { SearchParam } from '../cache/models/search-param.model';
-import { EpersonResponseParsingService } from '../eperson/eperson-response-parsing.service';
-import { BrowseItemsResponseParsingService } from './browse-items-response-parsing-service';
-import { MetadataschemaParsingService } from './metadataschema-parsing.service';
-import { MetadatafieldParsingService } from './metadatafield-parsing.service';
-import { URLCombiner } from '../url-combiner/url-combiner';
+import { RequestParam } from '../cache/models/request-param.model';
 import { TaskResponseParsingService } from '../tasks/task-response-parsing.service';
 import { ContentSourceResponseParsingService } from './content-source-response-parsing.service';
-import { MappedCollectionsReponseParsingService } from './mapped-collections-reponse-parsing.service';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
+import { environment } from '../../../environments/environment';
 
 /* tslint:disable:max-classes-per-file */
 
 // uuid and handle requests have separate endpoints
 export enum IdentifierType {
-  UUID ='uuid',
+  UUID = 'uuid',
   HANDLE = 'handle'
 }
 
 export abstract class RestRequest {
-  public responseMsToLive = 10 * 1000;
+  public responseMsToLive =  environment.cache.msToLive.default;
   public forceBypassCache = false;
+  public isMultipart = false;
+
   constructor(
     public uuid: string,
     public href: string,
@@ -42,28 +34,37 @@ export abstract class RestRequest {
   }
 
   getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return DSOResponseParsingService;
-  }
-
-  get toCache(): boolean {
-    return this.responseMsToLive > 0;
+    return DspaceRestResponseParsingService;
   }
 }
 
 export class GetRequest extends RestRequest {
-  public responseMsToLive = 60 * 15 * 1000;
-
   constructor(
     public uuid: string,
     public href: string,
     public body?: any,
     public options?: HttpOptions
-  )  {
+  ) {
     super(uuid, href, RestRequestMethod.GET, body, options)
   }
 }
 
 export class PostRequest extends RestRequest {
+  constructor(
+    public uuid: string,
+    public href: string,
+    public body?: any,
+    public options?: HttpOptions
+  ) {
+    super(uuid, href, RestRequestMethod.POST, body)
+  }
+}
+
+/**
+ * Request representing a multipart post request
+ */
+export class MultipartPostRequest extends RestRequest {
+  public isMultipart = true;
   constructor(
     public uuid: string,
     public href: string,
@@ -80,7 +81,7 @@ export class PutRequest extends RestRequest {
     public href: string,
     public body?: any,
     public options?: HttpOptions
-  )  {
+  ) {
     super(uuid, href, RestRequestMethod.PUT, body)
   }
 }
@@ -91,7 +92,7 @@ export class DeleteRequest extends RestRequest {
     public href: string,
     public body?: any,
     public options?: HttpOptions
-  )  {
+  ) {
     super(uuid, href, RestRequestMethod.DELETE, body)
   }
 }
@@ -102,7 +103,7 @@ export class OptionsRequest extends RestRequest {
     public href: string,
     public body?: any,
     public options?: HttpOptions
-  )  {
+  ) {
     super(uuid, href, RestRequestMethod.OPTIONS, body)
   }
 }
@@ -113,20 +114,18 @@ export class HeadRequest extends RestRequest {
     public href: string,
     public body?: any,
     public options?: HttpOptions
-  )  {
+  ) {
     super(uuid, href, RestRequestMethod.HEAD, body)
   }
 }
 
 export class PatchRequest extends RestRequest {
-  public responseMsToLive = 60 * 15 * 1000;
-
   constructor(
     public uuid: string,
     public href: string,
     public body?: any,
     public options?: HttpOptions
-  )  {
+  ) {
     super(uuid, href, RestRequestMethod.PATCH, body)
   }
 }
@@ -146,7 +145,7 @@ export class FindListOptions {
   elementsPerPage?: number;
   currentPage?: number;
   sort?: SortOptions;
-  searchParams?: SearchParam[];
+  searchParams?: RequestParam[];
   startsWith?: string;
 }
 
@@ -161,148 +160,11 @@ export class FindListRequest extends GetRequest {
 }
 
 export class EndpointMapRequest extends GetRequest {
-  public responseMsToLive = Number.MAX_SAFE_INTEGER;
-
-  constructor(
-    uuid: string,
-    href: string,
-    body?: any
-  ) {
-    super(uuid, new URLCombiner(href, '?endpointMap').toString(), body);
-  }
-
   getResponseParser(): GenericConstructor<ResponseParsingService> {
     return EndpointMapResponseParsingService;
   }
 }
 
-export class BrowseEndpointRequest extends GetRequest {
-  constructor(uuid: string, href: string) {
-    super(uuid, href);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return BrowseResponseParsingService;
-  }
-}
-
-export class BrowseEntriesRequest extends GetRequest {
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return BrowseEntriesResponseParsingService;
-  }
-}
-
-export class BrowseItemsRequest extends GetRequest {
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return BrowseItemsResponseParsingService;
-  }
-}
-
-/**
- * Request to fetch the mapped collections of an item
- */
-export class MappedCollectionsRequest extends GetRequest {
-  public responseMsToLive = 10000;
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MappedCollectionsReponseParsingService;
-  }
-}
-
-export class ConfigRequest extends GetRequest {
-  constructor(uuid: string, href: string, public options?: HttpOptions) {
-    super(uuid, href, null, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return ConfigResponseParsingService;
-  }
-}
-
-export class AuthPostRequest extends PostRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return AuthResponseParsingService;
-  }
-}
-
-export class AuthGetRequest extends GetRequest {
-  forceBypassCache = true;
-
-  constructor(uuid: string, href: string, public options?: HttpOptions) {
-    super(uuid, href, null, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return AuthResponseParsingService;
-  }
-}
-
-export class IntegrationRequest extends GetRequest {
-  constructor(uuid: string, href: string) {
-    super(uuid, href);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return IntegrationResponseParsingService;
-  }
-}
-
-/**
- * Request to create a MetadataSchema
- */
-export class CreateMetadataSchemaRequest extends PostRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadataschemaParsingService;
-  }
-}
-
-/**
- * Request to update a MetadataSchema
- */
-export class UpdateMetadataSchemaRequest extends PutRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadataschemaParsingService;
-  }
-}
-
-/**
- * Request to create a MetadataField
- */
-export class CreateMetadataFieldRequest extends PostRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadatafieldParsingService;
-  }
-}
-
-/**
- * Request to update a MetadataField
- */
-export class UpdateMetadataFieldRequest extends PutRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadatafieldParsingService;
-  }
-}
-
 /**
  * Class representing a submission HTTP GET request object
  */
@@ -362,27 +224,10 @@ export class SubmissionPostRequest extends PostRequest {
   }
 }
 
-/**
- * Class representing an eperson HTTP GET request object
- */
-export class EpersonRequest extends GetRequest {
-  constructor(uuid: string, href: string) {
-    super(uuid, href);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return EpersonResponseParsingService;
-  }
-}
-
 export class CreateRequest extends PostRequest {
   constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
     super(uuid, href, body, options);
   }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return DSOResponseParsingService;
-  }
 }
 
 export class ContentSourceRequest extends GetRequest {
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index d32fe348b53..19be54a3577 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -1,18 +1,17 @@
 import * as deepFreeze from 'deep-freeze';
-import { RestResponse } from '../cache/response.models';
 import {
-  RequestCompleteAction,
   RequestConfigureAction,
+  RequestErrorAction,
   RequestExecuteAction,
   RequestRemoveAction,
-  ResetResponseTimestampsAction
+  RequestSuccessAction,
+  ResetResponseTimestampsAction,
+  RequestStaleAction
 } from './request.actions';
 import { GetRequest } from './request.models';
+import { RequestEntryState, requestReducer, RequestState } from './request.reducer';
 
-import { requestReducer, RequestState } from './request.reducer';
-
-const response =  new RestResponse(true, 200, 'OK');
-class NullAction extends RequestCompleteAction {
+class NullAction extends RequestSuccessAction {
   type = null;
   payload = null;
 
@@ -26,22 +25,35 @@ describe('requestReducer', () => {
   const id2 = 'clients/eb7cde2e-a03f-4f0b-ac5d-888a4ef2b4eb';
   const link1 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/567a639f-f5ff-4126-807c-b7d0910808c8';
   const link2 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/1911e8a4-6939-490c-b58b-a5d70f8d91fb';
-  const testState: RequestState = {
+  const testInitState: RequestState = {
     [id1]: {
       request: new GetRequest(id1, link1),
-      requestPending: false,
-      responsePending: false,
-      completed: false,
-      response: undefined
+      state: RequestEntryState.RequestPending,
+      response: undefined,
+      lastUpdated: undefined
+    }
+  };
+  const testSuccessState = {
+    [id1]: {
+      state: RequestEntryState.Success,
+      lastUpdated: 0
+    }
+  };
+  const testErrorState = {
+    [id1]: {
+      state: RequestEntryState.Error,
+      lastUpdated: 0
     }
   };
-  deepFreeze(testState);
+  deepFreeze(testInitState);
+  deepFreeze(testSuccessState);
+  deepFreeze(testErrorState);
 
   it('should return the current state when no valid actions have been made', () => {
     const action = new NullAction();
-    const newState = requestReducer(testState, action);
+    const newState = requestReducer(testInitState, action);
 
-    expect(newState).toEqual(testState);
+    expect(newState).toEqual(testInitState);
   });
 
   it('should start with an empty state', () => {
@@ -51,8 +63,8 @@ describe('requestReducer', () => {
     expect(initialState).toEqual(Object.create(null));
   });
 
-  it('should add the new RestRequest and set \'requestPending\' to true, \'responsePending\' to false and \'completed\' to false for the given RestRequest in the state, in response to a CONFIGURE action', () => {
-    const state = testState;
+  it('should add the new RestRequest and set state to RequestPending for the given RestRequest in the state, in response to a CONFIGURE action', () => {
+    const state = testInitState;
     const request = new GetRequest(id2, link2);
 
     const action = new RequestConfigureAction(request);
@@ -60,65 +72,98 @@ describe('requestReducer', () => {
 
     expect(newState[id2].request.uuid).toEqual(id2);
     expect(newState[id2].request.href).toEqual(link2);
-    expect(newState[id2].requestPending).toEqual(true);
-    expect(newState[id2].responsePending).toEqual(false);
-    expect(newState[id2].completed).toEqual(false);
-    expect(newState[id2].response).toEqual(undefined);
+    expect(newState[id2].state).toEqual(RequestEntryState.RequestPending);
+    expect(newState[id2].response).toBeNull();
   });
 
-  it('should set \'requestPending\' to false, \'responsePending\' to true and leave \'completed\' untouched for the given RestRequest in the state, in response to an EXECUTE action', () => {
-    const state = testState;
+  it('should set state to ResponsePending for the given RestRequest in the state, in response to an EXECUTE action', () => {
+    const state = testInitState;
 
     const action = new RequestExecuteAction(id1);
     const newState = requestReducer(state, action);
 
     expect(newState[id1].request.uuid).toEqual(id1);
     expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].requestPending).toEqual(false);
-    expect(newState[id1].responsePending).toEqual(true);
-    expect(newState[id1].completed).toEqual(state[id1].completed);
+    expect(newState[id1].state).toEqual(RequestEntryState.ResponsePending);
     expect(newState[id1].response).toEqual(undefined)
   });
 
-  it('should leave \'requestPending\' untouched, set \'responsePending\' to false and \'completed\' to true for the given RestRequest in the state, in response to a COMPLETE action', () => {
-    const state = testState;
+  it('should set state to Success for the given RestRequest in the state, in response to a SUCCESS action', () => {
+    const state = testInitState;
 
-    const action = new RequestCompleteAction(id1, response);
+    const action = new RequestSuccessAction(id1, 200);
     const newState = requestReducer(state, action);
 
     expect(newState[id1].request.uuid).toEqual(id1);
     expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].requestPending).toEqual(state[id1].requestPending);
-    expect(newState[id1].responsePending).toEqual(false);
-    expect(newState[id1].completed).toEqual(true);
-    expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful);
-    expect(newState[id1].response.statusCode).toEqual(response.statusCode);
-    expect(newState[id1].response.timeAdded).toBeTruthy()
+    expect(newState[id1].state).toEqual(RequestEntryState.Success);
+    expect(newState[id1].response.statusCode).toEqual(200);
   });
 
-  it('should leave \'requestPending\' untouched, should leave \'responsePending\' untouched and leave \'completed\' untouched, but update the response\'s timeAdded for the given RestRequest in the state, in response to a COMPLETE action', () => {
-    const update = Object.assign({}, testState[id1], {response});
-    const state = Object.assign({}, testState, {[id1]: update});
+  it('should set state to Error for the given RestRequest in the state, in response to an ERROR action', () => {
+    const state = testInitState;
+
+    const action = new RequestErrorAction(id1, 404, 'Not Found');
+    const newState = requestReducer(state, action);
+
+    expect(newState[id1].request.uuid).toEqual(id1);
+    expect(newState[id1].request.href).toEqual(link1);
+    expect(newState[id1].state).toEqual(RequestEntryState.Error);
+    expect(newState[id1].response.statusCode).toEqual(404);
+    expect(newState[id1].response.errorMessage).toEqual('Not Found');
+  });
+
+  it('should update the response\'s timeCompleted for the given RestRequest in the state, in response to a RESET_TIMESTAMPS action', () => {
+    const update = Object.assign({}, testInitState[id1], {
+      response: {
+        timeCompleted: 10,
+        statusCode: 200
+      }
+    });
+    const state = Object.assign({}, testInitState, {[id1]: update});
     const timeStamp = 1000;
     const action = new ResetResponseTimestampsAction(timeStamp);
     const newState = requestReducer(state, action);
 
     expect(newState[id1].request.uuid).toEqual(state[id1].request.uuid);
     expect(newState[id1].request.href).toEqual(state[id1].request.href);
-    expect(newState[id1].requestPending).toEqual(state[id1].requestPending);
-    expect(newState[id1].responsePending).toEqual(state[id1].responsePending);
-    expect(newState[id1].completed).toEqual(state[id1].completed);
-    expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful);
-    expect(newState[id1].response.statusCode).toEqual(response.statusCode);
-    expect(newState[id1].response.timeAdded).toBe(timeStamp);
+    expect(newState[id1].state).toEqual(state[id1].state);
+    expect(newState[id1].response.statusCode).toEqual(update.response.statusCode);
+    expect(newState[id1].response.timeCompleted).toBe(timeStamp);
+    expect(newState[id1].lastUpdated).toBe(timeStamp);
   });
 
   it('should remove the correct request, in response to a REMOVE action', () => {
-    const state = testState;
+    const state = testInitState;
 
     const action = new RequestRemoveAction(id1);
     const newState = requestReducer(state, action);
 
-    expect(newState[id1]).toBeUndefined();
+    expect(newState[id1]).toBeNull();
+  });
+
+  describe(`for an entry with state: Success`, () => {
+    it(`should set the state to SuccessStale, in response to a STALE action`, () => {
+      const state = testSuccessState;
+
+      const action = new RequestStaleAction(id1);
+      const newState = requestReducer(state, action);
+
+      expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
+      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+    });
   });
+
+  describe(`for an entry with state: Error`, () => {
+    it(`should set the state to ErrorStale, in response to a STALE action`, () => {
+      const state = testErrorState;
+
+      const action = new RequestStaleAction(id1);
+      const newState = requestReducer(state, action);
+
+      expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
+      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+    });
+  });
+
 });
diff --git a/src/app/core/data/request.reducer.ts b/src/app/core/data/request.reducer.ts
index e324e4d5a20..ed83a8e130a 100644
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -1,16 +1,123 @@
 import {
-  RequestActionTypes, RequestAction, RequestConfigureAction,
-  RequestExecuteAction, RequestCompleteAction, ResetResponseTimestampsAction, RequestRemoveAction
+  RequestAction,
+  RequestActionTypes,
+  RequestConfigureAction,
+  RequestExecuteAction,
+  RequestRemoveAction,
+  ResetResponseTimestampsAction,
+  RequestSuccessAction,
+  RequestErrorAction,
+  RequestStaleAction
 } from './request.actions';
 import { RestRequest } from './request.models';
-import { RestResponse } from '../cache/response.models';
+import { HALLink } from '../shared/hal-link.model';
+import { UnCacheableObject } from '../shared/uncacheable-object.model';
+import { isNull } from '../../shared/empty.util';
 
+export enum RequestEntryState {
+  RequestPending = 'RequestPending',
+  ResponsePending = 'ResponsePending',
+  Error = 'Error',
+  Success = 'Success',
+  ErrorStale = 'ErrorStale',
+  SuccessStale = 'SuccessStale'
+}
+
+/**
+ * Returns true if the given state is RequestPending, false otherwise
+ */
+export const isRequestPending = (state: RequestEntryState) =>
+  state === RequestEntryState.RequestPending;
+
+/**
+ * Returns true if the given state is ResponsePending, false otherwise
+ */
+export const isResponsePending = (state: RequestEntryState) =>
+  state === RequestEntryState.ResponsePending;
+
+/**
+ * Returns true if the given state is Error, false otherwise
+ */
+export const isError = (state: RequestEntryState) =>
+  state === RequestEntryState.Error;
+
+/**
+ * Returns true if the given state is Success, false otherwise
+ */
+export const isSuccess = (state: RequestEntryState) =>
+  state === RequestEntryState.Success;
+
+/**
+ * Returns true if the given state is ErrorStale, false otherwise
+ */
+export const isErrorStale = (state: RequestEntryState) =>
+  state === RequestEntryState.ErrorStale;
+
+/**
+ * Returns true if the given state is SuccessStale, false otherwise
+ */
+export const isSuccessStale = (state: RequestEntryState) =>
+  state === RequestEntryState.SuccessStale;
+
+/**
+ * Returns true if the given state is RequestPending or ResponsePending,
+ * false otherwise
+ */
+export const isLoading = (state: RequestEntryState) =>
+  isRequestPending(state) || isResponsePending(state);
+
+/**
+ * If isLoading is true for the given state, this method returns undefined, we can't know yet.
+ * If it isn't this method will return true if the the given state is Error or ErrorStale,
+ * false otherwise
+ */
+export const hasFailed = (state: RequestEntryState) => {
+  if (isLoading(state)) {
+    return undefined;
+  } else {
+    return isError(state) || isErrorStale(state);
+  }
+};
+
+/**
+ * If isLoading is true for the given state, this method returns undefined, we can't know yet.
+ * If it isn't this method will return true if the the given state is Success or SuccessStale,
+ * false otherwise
+ */
+export const hasSucceeded = (state: RequestEntryState) => {
+  if (isLoading(state)) {
+    return undefined;
+  } else {
+    return isSuccess(state) || isSuccessStale(state);
+  }
+};
+
+/**
+ * Returns true if the given state is not loading, false otherwise
+ */
+export const hasCompleted = (state: RequestEntryState) =>
+  !isLoading(state);
+
+/**
+ * Returns true if the given state is SuccessStale or ErrorStale, false otherwise
+ */
+export const isStale = (state: RequestEntryState) =>
+  isSuccessStale(state) || isErrorStale(state);
+
+export class ResponseState {
+  timeCompleted: number;
+  statusCode: number;
+  errorMessage?: string;
+  payloadLink?: HALLink;
+  unCacheableObject?: UnCacheableObject;
+}
+
+// tslint:disable-next-line:max-classes-per-file
 export class RequestEntry {
   request: RestRequest;
-  requestPending: boolean;
-  responsePending: boolean;
-  completed: boolean;
-  response: RestResponse
+  state: RequestEntryState;
+  response: ResponseState;
+  lastUpdated: number;
 }
 
 export interface RequestState {
@@ -20,91 +127,179 @@ export interface RequestState {
 // Object.create(null) ensures the object has no default js properties (e.g. `__proto__`)
 const initialState = Object.create(null);
 
-export function requestReducer(state = initialState, action: RequestAction): RequestState {
+export function requestReducer(storeState = initialState, action: RequestAction): RequestState {
   switch (action.type) {
 
     case RequestActionTypes.CONFIGURE: {
-      return configureRequest(state, action as RequestConfigureAction);
+      return configureRequest(storeState, action as RequestConfigureAction);
     }
 
     case RequestActionTypes.EXECUTE: {
-      return executeRequest(state, action as RequestExecuteAction);
+      return executeRequest(storeState, action as RequestExecuteAction);
+    }
+
+    case RequestActionTypes.SUCCESS: {
+      return completeSuccessRequest(storeState, action as RequestSuccessAction);
+    }
+
+    case RequestActionTypes.ERROR: {
+      return completeFailedRequest(storeState, action as RequestErrorAction);
     }
 
-    case RequestActionTypes.COMPLETE: {
-      return completeRequest(state, action as RequestCompleteAction);
+    case RequestActionTypes.STALE: {
+      return expireRequest(storeState, action as RequestStaleAction);
     }
+
     case RequestActionTypes.RESET_TIMESTAMPS: {
-      return resetResponseTimestamps(state, action as ResetResponseTimestampsAction);
+      return resetResponseTimestamps(storeState, action as ResetResponseTimestampsAction);
     }
 
     case RequestActionTypes.REMOVE: {
-      return removeRequest(state, action as RequestRemoveAction);
+      return removeRequest(storeState, action as RequestRemoveAction);
     }
 
     default: {
-      return state;
+      return storeState;
     }
   }
 }
 
-function configureRequest(state: RequestState, action: RequestConfigureAction): RequestState {
-  return Object.assign({}, state, {
+function configureRequest(storeState: RequestState, action: RequestConfigureAction): RequestState {
+  return Object.assign({}, storeState, {
     [action.payload.uuid]: {
       request: action.payload,
-      requestPending: true,
-      responsePending: false,
-      completed: false,
+      state: RequestEntryState.RequestPending,
+      response: null,
+      lastUpdated: action.lastUpdated
     }
   });
 }
 
-function executeRequest(state: RequestState, action: RequestExecuteAction): RequestState {
-  const obs = Object.assign({}, state, {
-    [action.payload]: Object.assign({}, state[action.payload], {
-      requestPending: false,
-      responsePending: true
-    })
-  });
-  return obs;
+function executeRequest(storeState: RequestState, action: RequestExecuteAction): RequestState {
+  if (isNull(storeState[action.payload])) {
+    // after a request has been removed it's possible pending changes still come in.
+    // Don't store them
+    return storeState;
+  } else {
+    return Object.assign({}, storeState, {
+      [action.payload]: Object.assign({}, storeState[action.payload], {
+        state: RequestEntryState.ResponsePending,
+        lastUpdated: action.lastUpdated
+      })
+    });
+  }
 }
 
 /**
- * Update a request with the response
+ * Update a request with that succeeded with the response
  *
- * @param state
- *    the current state
+ * @param storeState
+ *    the current state of the store
  * @param action
- *    a RequestCompleteAction
+ *    a RequestSuccessAction
  * @return RequestState
- *    the new state, with the response added to the request
- */
-function completeRequest(state: RequestState, action: RequestCompleteAction): RequestState {
-  const time = new Date().getTime();
-  return Object.assign({}, state, {
-    [action.payload.uuid]: Object.assign({}, state[action.payload.uuid], {
-      responsePending: false,
-      completed: true,
-      response: Object.assign({}, action.payload.response, { timeAdded: time })
-    })
-  });
+ *    the new storeState, with the response added to the request
+ */
+function completeSuccessRequest(storeState: RequestState, action: RequestSuccessAction): RequestState {
+  if (isNull(storeState[action.payload.uuid])) {
+    // after a request has been removed it's possible pending changes still come in.
+    // Don't store them
+    return storeState;
+  } else {
+    return Object.assign({}, storeState, {
+      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
+        state: RequestEntryState.Success,
+        response: {
+          timeCompleted: action.payload.timeCompleted,
+          lastUpdated: action.payload.timeCompleted,
+          statusCode: action.payload.statusCode,
+          payloadLink: action.payload.link,
+          unCacheableObject: action.payload.unCacheableObject,
+          errorMessage: null
+        },
+        lastUpdated: action.lastUpdated
+      })
+    });
+  }
 }
 
 /**
- * Reset the timeAdded property of all responses
+ * Update a request with that failed with the response
  *
- * @param state
- *    the current state
+ * @param storeState
+ *    the current state of the store
  * @param action
- *    a RequestCompleteAction
+ *    a RequestSuccessAction
  * @return RequestState
- *    the new state, with the timeAdded property reset
+ *    the new storeState, with the response added to the request
  */
-function resetResponseTimestamps(state: RequestState, action: ResetResponseTimestampsAction): RequestState {
+function completeFailedRequest(storeState: RequestState, action: RequestErrorAction): RequestState {
+  if (isNull(storeState[action.payload.uuid])) {
+    // after a request has been removed it's possible pending changes still come in.
+    // Don't store them
+    return storeState;
+  } else {
+    return Object.assign({}, storeState, {
+      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
+        state: RequestEntryState.Error,
+        response: {
+          timeCompleted: action.payload.timeCompleted,
+          lastUpdated: action.payload.timeCompleted,
+          statusCode: action.payload.statusCode,
+          payloadLink: null,
+          errorMessage: action.payload.errorMessage,
+        },
+        lastUpdated: action.lastUpdated
+      })
+    });
+  }
+}
+/**
+ * Set a request to stale
+ *
+ * @param storeState
+ *    the current state of the store
+ * @param action
+ *    a RequestStaleAction
+ * @return RequestState
+ *    the new storeState, set to stale
+ */
+function expireRequest(storeState: RequestState, action: RequestStaleAction): RequestState {
+  if (isNull(storeState[action.payload.uuid])) {
+    // after a request has been removed it's possible pending changes still come in.
+    // Don't store them
+    return storeState;
+  } else {
+    const prevEntry = storeState[action.payload.uuid];
+    return Object.assign({}, storeState, {
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        state: hasSucceeded(prevEntry.state) ? RequestEntryState.SuccessStale : RequestEntryState.ErrorStale,
+        lastUpdated: action.lastUpdated
+      })
+    });
+  }
+}
+
+/**
+ * Reset the timeCompleted property of all responses
+ *
+ * @param storeState
+ *    the current state of the store
+ * @param action
+ *    a ResetResponseTimestampsAction
+ * @return RequestState
+ *    the new storeState, with the timeCompleted property reset
+ */
+function resetResponseTimestamps(storeState: RequestState, action: ResetResponseTimestampsAction): RequestState {
   const newState = Object.create(null);
-  Object.keys(state).forEach((key) => {
-    newState[key] = Object.assign({}, state[key],
-      { response: Object.assign({}, state[key].response, { timeAdded: action.payload }) }
+  Object.keys(storeState).forEach((key) => {
+    newState[key] = Object.assign({}, storeState[key],
+      {
+        response: Object.assign({}, storeState[key].response, {
+          timeCompleted: action.payload
+        }),
+        lastUpdated: action.payload
+      }
     );
   });
   return newState;
@@ -112,15 +307,11 @@ function resetResponseTimestamps(state: RequestState, action: ResetResponseTimes
 
 /**
  * Remove a request from the RequestState
- * @param state   The current RequestState
+ * @param storeState The current RequestState
  * @param action  The RequestRemoveAction to perform
  */
-function removeRequest(state: RequestState, action: RequestRemoveAction): RequestState {
-  const newState = Object.create(null);
-  for (const value in state) {
-    if (value !== action.uuid) {
-      newState[value] = state[value];
-    }
-  }
+function removeRequest(storeState: RequestState, action: RequestRemoveAction): RequestState {
+  const newState = Object.assign({}, storeState);
+  newState[action.uuid] = null;
   return newState;
 }
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index 253577a7017..fd48ea8322d 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -3,7 +3,6 @@ import { ActionsSubject, Store } from '@ngrx/store';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { BehaviorSubject, EMPTY, of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
 import { defaultUUID, getMockUUIDService } from '../../shared/mocks/uuid.service.mock';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -20,9 +19,8 @@ import {
   PutRequest,
   RestRequest
 } from './request.models';
-import { RequestEntry } from './request.reducer';
+import { RequestEntry, RequestEntryState } from './request.reducer';
 import { RequestService } from './request.service';
-import { parseJsonSchemaToCommandDescription } from '@angular/cli/utilities/json-schema';
 
 describe('RequestService', () => {
   let scheduler: TestScheduler;
@@ -47,7 +45,7 @@ describe('RequestService', () => {
     scheduler = getTestScheduler();
 
     objectCache = getMockObjectCacheService();
-    (objectCache.hasBySelfLink as any).and.returnValue(false);
+    (objectCache.hasByHref as any).and.returnValue(false);
 
     uuidService = getMockUUIDService();
 
@@ -108,7 +106,7 @@ describe('RequestService', () => {
     describe('when the request has reached the store, before the server responds', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValue(observableOf({
-          completed: false
+          state: RequestEntryState.ResponsePending
         } as RequestEntry))
       });
 
@@ -123,7 +121,7 @@ describe('RequestService', () => {
     describe('after the server responds', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValues(observableOf({
-          completed: true
+          state: RequestEntryState.Success
         } as RequestEntry));
       });
 
@@ -139,13 +137,20 @@ describe('RequestService', () => {
 
   describe('getByUUID', () => {
     describe('if the request with the specified UUID exists in the store', () => {
+      let entry;
+
       beforeEach(() => {
         let callCounter = 0;
+        entry = {
+          state: RequestEntryState.Success,
+          response: {
+            timeCompleted: new Date().getTime()
+          },
+          request: new GetRequest('request-uuid', 'request-href')
+        };
         const responses = [
           cold('a', { // A direct hit in the request cache
-            a: {
-              completed: true
-            }
+            a: entry
           }),
           cold('b', { b: undefined }), // No hit in the index
           cold('c', { c: undefined })  // So no mapped hit in the request cache
@@ -162,9 +167,7 @@ describe('RequestService', () => {
       it('should return an Observable of the RequestEntry', () => {
         const result = service.getByUUID(testUUID);
         const expected = cold('b', {
-          b: {
-            completed: true
-          }
+          b: entry
         });
 
         expect(result).toBeObservable(expected);
@@ -196,15 +199,22 @@ describe('RequestService', () => {
     });
 
     describe(`if the request with the specified UUID wasn't sent, because it was already cached`, () => {
+      let entry;
+
       beforeEach(() => {
         let callCounter = 0;
+        entry = {
+          state: RequestEntryState.Success,
+          response: {
+            timeCompleted: new Date().getTime()
+          },
+          request: new GetRequest('request-uuid', 'request-href')
+        };
         const responses = [
           cold('a', { a: undefined }), // No direct hit in the request cache with that UUID
           cold('b', { b: 'otherRequestUUID' }), // A hit in the index, which returns the uuid of the cached request
           cold('c', {   // the call to retrieve the cached request using the UUID from the index
-            c: {
-              completed: true
-            }
+            c: entry
           })
         ];
         selectSpy.and.callFake(() => {
@@ -220,9 +230,7 @@ describe('RequestService', () => {
         const result = service.getByUUID(testUUID);
 
         scheduler.expectObservable(result).toBe('c', {
-          c: {
-            completed: true
-          }
+          c: entry
         });
       });
     });
@@ -293,6 +301,7 @@ describe('RequestService', () => {
 
       it('should track it on it\'s way to the store', () => {
         spyOn(serviceAsAny, 'trackRequestsOnTheirWayToTheStore');
+        spyOn(serviceAsAny, 'isCachedOrPending').and.returnValue(false);
         service.configure(request);
         expect(serviceAsAny.trackRequestsOnTheirWayToTheStore).toHaveBeenCalledWith(request);
       });
@@ -347,9 +356,9 @@ describe('RequestService', () => {
     describe('when the request is cached', () => {
       describe('in the ObjectCache', () => {
         beforeEach(() => {
-          (objectCache.hasBySelfLink as any).and.returnValue(true);
-          (objectCache.hasByUUID as any).and.returnValue(true);
+          (objectCache.getByHref as any).and.returnValue(observableOf({ requestUUID: 'some-uuid' }));
           spyOn(serviceAsAny, 'hasByHref').and.returnValue(false);
+          spyOn(serviceAsAny, 'hasByUUID').and.returnValue(true);
         });
 
         it('should return true for GetRequest', () => {
@@ -361,8 +370,9 @@ describe('RequestService', () => {
       });
       describe('in the request cache', () => {
         beforeEach(() => {
-          (objectCache.hasBySelfLink as any).and.returnValue(false);
-          spyOn(serviceAsAny, 'hasByHref').and.returnValue(true);
+          (objectCache.getByHref as any).and.returnValue(observableOf(undefined));
+          spyOn(serviceAsAny, 'hasByHref').and.returnValues(true);
+          spyOn(serviceAsAny, 'hasByUUID').and.returnValue(false);
         });
         it('should return true', () => {
           const result = serviceAsAny.isCachedOrPending(testGetRequest);
@@ -387,6 +397,12 @@ describe('RequestService', () => {
     });
 
     describe('when the request is neither cached nor pending', () => {
+      beforeEach(() => {
+        (objectCache.getByHref as any).and.returnValue(EMPTY);
+        spyOn(serviceAsAny, 'hasByHref').and.returnValues(false);
+        spyOn(serviceAsAny, 'hasByUUID').and.returnValue(false);
+      });
+
       it('should return false', () => {
         const result = serviceAsAny.isCachedOrPending(testGetRequest);
         const expected = false;
@@ -440,9 +456,17 @@ describe('RequestService', () => {
 
   describe('trackRequestsOnTheirWayToTheStore', () => {
     let request: GetRequest;
+    let entry;
 
     beforeEach(() => {
       request = testGetRequest;
+      entry = {
+        state: RequestEntryState.Success,
+        response: {
+          timeCompleted: new Date().getTime()
+        },
+        request: request
+      };
     });
 
     describe('when the method is called with a new request', () => {
@@ -457,7 +481,7 @@ describe('RequestService', () => {
       it('should stop tracking the request', () => {
         selectSpy.and.callFake(() => {
           return () => {
-            return () => observableOf({ request });
+            return () => observableOf(entry);
           };
         });
         serviceAsAny.trackRequestsOnTheirWayToTheStore(request);
@@ -466,97 +490,6 @@ describe('RequestService', () => {
     });
   });
 
-  describe('isValid', () => {
-    describe('when the given entry has no value', () => {
-      let valid;
-      beforeEach(() => {
-        const entry = undefined;
-        valid = serviceAsAny.isValid(entry);
-      });
-      it('return an observable emitting false', () => {
-        expect(valid).toBe(false);
-      })
-    });
-
-    describe('when the given entry has a value, but the request is not completed', () => {
-      let valid;
-      const requestEntry = { completed: false };
-      beforeEach(() => {
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
-        valid = serviceAsAny.isValid(requestEntry);
-      });
-      it('return an observable emitting false', () => {
-        expect(valid).toBe(false);
-      })
-    });
-
-    describe('when the given entry has a value, but the response is not successful', () => {
-      let valid;
-      const requestEntry = { completed: true, response: { isSuccessful: false } };
-      beforeEach(() => {
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
-        valid = serviceAsAny.isValid(requestEntry);
-      });
-      it('return an observable emitting false', () => {
-        expect(valid).toBe(false);
-      })
-    });
-
-    describe('when the given UUID has a value, its response was successful, but the response is outdated', () => {
-      let valid;
-      const now = 100000;
-      const timeAdded = 99899;
-      const msToLive = 100;
-      const requestEntry = {
-        completed: true,
-        response: {
-          isSuccessful: true,
-          timeAdded: timeAdded
-        },
-        request: {
-          responseMsToLive: msToLive,
-        }
-      };
-
-      beforeEach(() => {
-        spyOn(Date.prototype, 'getTime').and.returnValue(now);
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
-        valid = serviceAsAny.isValid(requestEntry);
-      });
-
-      it('return an observable emitting false', () => {
-        expect(valid).toBe(false);
-      })
-    });
-
-    describe('when the given UUID has a value, a cached entry is found, its response was successful, and the response is not outdated', () => {
-      let valid;
-      const now = 100000;
-      const timeAdded = 99999;
-      const msToLive = 100;
-
-      const requestEntry = {
-        completed: true,
-        response: {
-          isSuccessful: true,
-          timeAdded: timeAdded
-        },
-        request: {
-          responseMsToLive: msToLive
-        }
-      };
-      beforeEach(() => {
-        spyOn(Date.prototype, 'getTime').and.returnValue(now);
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
-        valid = serviceAsAny.isValid(requestEntry);
-      });
-
-      it('return an observable emitting true', () => {
-        expect(valid).toBe(true);
-      })
-    })
-  });
-
   describe('hasByHref', () => {
     describe('when nothing is returned by getByHref', () => {
       beforeEach(() => {
@@ -568,24 +501,22 @@ describe('RequestService', () => {
       });
     });
 
-    describe('when isValid returns false', () => {
+    describe('when the RequestEntry is undefined', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValue(observableOf(undefined));
-        spyOn(service as any, 'isValid').and.returnValue(false);
       });
       it('hasByHref should return false', () => {
-        const result = service.hasByHref('');
+        const result = service.hasByHref('', false);
         expect(result).toBe(false);
       });
     });
 
-    describe('when isValid returns true', () => {
+    describe('when the RequestEntry is not undefined', () => {
       beforeEach(() => {
-        spyOn(service, 'getByHref').and.returnValue(observableOf(undefined));
-        spyOn(service as any, 'isValid').and.returnValue(true);
+        spyOn(service, 'getByHref').and.returnValue(observableOf({} as any));
       });
       it('hasByHref should return true', () => {
-        const result = service.hasByHref('');
+        const result = service.hasByHref('', false);
         expect(result).toBe(true);
       });
     });
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 105d84cf4a5..4208fe909c0 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -3,25 +3,30 @@ import { HttpHeaders } from '@angular/common/http';
 
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
-import { filter, map, mergeMap, take, switchMap, startWith } from 'rxjs/operators';
-import { cloneDeep, remove } from 'lodash';
-import { hasValue, isEmpty, isNotEmpty, hasValueOperator } from '../../shared/empty.util';
-import { CacheableObject } from '../cache/object-cache.reducer';
+import { filter, map, mergeMap, take, switchMap, tap } from 'rxjs/operators';
+import { cloneDeep } from 'lodash';
+import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../../shared/empty.util';
+import { CacheableObject, ObjectCacheEntry } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core.reducers';
 import { IndexName, IndexState, MetaIndexState } from '../index/index.reducer';
 import {
   originalRequestUUIDFromRequestUUIDSelector,
   requestIndexSelector,
-  uuidFromHrefSelector
+  uuidFromHrefSelector,
+  getUrlWithoutEmbedParams
 } from '../index/index.selectors';
 import { UUIDService } from '../shared/uuid.service';
-import { RequestConfigureAction, RequestExecuteAction, RequestRemoveAction } from './request.actions';
+import {
+  RequestConfigureAction,
+  RequestExecuteAction,
+  RequestStaleAction
+} from './request.actions';
 import { GetRequest, RestRequest } from './request.models';
-import { RequestEntry, RequestState } from './request.reducer';
+import { RequestEntry, RequestState, hasCompleted, isStale, isLoading } from './request.reducer';
 import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
 import { RestRequestMethod } from './rest-request-method';
-import { AddToIndexAction, RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import { AddToIndexAction } from '../index/index.actions';
 import { coreSelector } from '../core.selectors';
 
 /**
@@ -63,11 +68,43 @@ const uuidsFromHrefSubstringSelector =
 const getUuidsFromHrefSubstring = (state: IndexState, href: string): string[] => {
   let result = [];
   if (isNotEmpty(state)) {
-    result = Object.keys(state).filter((key) => key.startsWith(href)).map((key) => state[key]);
+    result = Object.keys(state).filter((key) => key.includes(href)).map((key) => state[key]);
   }
   return result;
 };
 
+/**
+ * Check whether a cached entry exists and isn't stale
+ *
+ * @param entry
+ *    the entry to check
+ * @return boolean
+ *    false if the entry has no value, or its time to live has exceeded,
+ *    true otherwise
+ */
+const isValid = (entry: RequestEntry): boolean => {
+  if (hasNoValue(entry)) {
+    // undefined entries are invalid
+    return false
+  } else {
+    if (isLoading(entry.state)) {
+      // entries that are still loading are always valid
+      return true;
+    } else {
+      if (isStale(entry.state)) {
+        // entries that are stale are always invalid
+        return false;
+      } else {
+        // check whether it should be stale
+        const timeOutdated = entry.response.timeCompleted + entry.request.responseMsToLive;
+        const now = new Date().getTime();
+        const isOutDated = now > timeOutdated;
+        return !isOutDated;
+      }
+    }
+  }
+}
+
 /**
  * A service to interact with the request state in the store
  */
@@ -101,7 +138,7 @@ export class RequestService {
     this.getByHref(request.href).pipe(
       take(1))
       .subscribe((re: RequestEntry) => {
-        isPending = (hasValue(re) && !re.completed)
+        isPending = (hasValue(re) && !hasCompleted(re.state))
       });
     return isPending;
   }
@@ -117,7 +154,7 @@ export class RequestService {
       this.store.pipe(
         select(originalRequestUUIDFromRequestUUIDSelector(uuid)),
         switchMap((originalUUID) => {
-              return this.store.pipe(select(entryFromUUIDSelector(originalUUID)))
+            return this.store.pipe(select(entryFromUUIDSelector(originalUUID)))
           },
         ),
       ),
@@ -131,6 +168,11 @@ export class RequestService {
           entry.request.options.headers = Object.assign(new HttpHeaders(), entry.request.options.headers)
         }
         return entry;
+      }),
+      tap((entry: RequestEntry) => {
+        if (hasValue(entry) && !isStale(entry.state) && !isValid(entry)) {
+          this.store.dispatch(new RequestStaleAction(uuid));
+        }
       })
     );
   }
@@ -198,29 +240,37 @@ export class RequestService {
   }
 
   /**
-   * Remove all request cache providing (part of) the href
-   * This also includes href-to-uuid index cache
+   * Set all requests that match (part of) the href to stale
+   *
+   * @param href    A substring of the request(s) href
+   * @return        Returns an observable emitting whether or not the cache is removed
+   * @deprecated    use setStaleByHrefSubstring instead
+   */
+  removeByHrefSubstring(href: string): Observable<boolean> {
+    return this.setStaleByHrefSubstring(href);
+  }
+
+  /**
+   * Set all requests that match (part of) the href to stale
+   *
    * @param href    A substring of the request(s) href
+   * @return        Returns an observable emitting whether or not the cache is removed
    */
-  removeByHrefSubstring(href: string) {
+  setStaleByHrefSubstring(href: string): Observable<boolean> {
     this.store.pipe(
       select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
       take(1)
     ).subscribe((uuids: string[]) => {
       for (const uuid of uuids) {
-        this.removeByUuid(uuid);
+        this.store.dispatch(new RequestStaleAction(uuid));
       }
     });
     this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((reqHref: string) => reqHref.indexOf(href) < 0);
-    this.indexStore.dispatch(new RemoveFromIndexBySubstringAction(IndexName.REQUEST, href));
-  }
 
-  /**
-   * Remove request cache using the request's UUID
-   * @param uuid
-   */
-  removeByUuid(uuid: string) {
-    this.store.dispatch(new RequestRemoveAction(uuid));
+    return this.store.pipe(
+      select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
+      map((uuids) => isEmpty(uuids))
+    );
   }
 
   /**
@@ -229,11 +279,22 @@ export class RequestService {
    * @returns {boolean} True if the request is cached or still pending
    */
   public isCachedOrPending(request: GetRequest): boolean {
-    const inReqCache = this.hasByHref(request.href);
-    const inObjCache = this.objectCache.hasBySelfLink(request.href);
-    const isCached = inReqCache || inObjCache;
-    const isPending = this.isPending(request);
-    return isCached || isPending;
+    if (this.isPending(request)) {
+      return true;
+    } else {
+      const urlWithoutEmbedParams = getUrlWithoutEmbedParams(request.href);
+      if (this.hasByHref(urlWithoutEmbedParams) === true) {
+        return true;
+      } else {
+        let inObjCache = false;
+        this.objectCache.getByHref(urlWithoutEmbedParams)
+          .subscribe((entry: ObjectCacheEntry) => {
+            inObjCache = this.hasByUUID(entry.requestUUID);
+          }).unsubscribe();
+
+        return inObjCache;
+      }
+    }
   }
 
   /**
@@ -254,7 +315,7 @@ export class RequestService {
    */
   private trackRequestsOnTheirWayToTheStore(request: GetRequest) {
     this.requestsOnTheirWayToTheStore = [...this.requestsOnTheirWayToTheStore, request.href];
-    this.getByHref(request.href).pipe(
+    this.getByUUID(request.uuid).pipe(
       filter((re: RequestEntry) => hasValue(re)),
       take(1)
     ).subscribe((re: RequestEntry) => {
@@ -262,20 +323,6 @@ export class RequestService {
     });
   }
 
-  /**
-   * This method remove requests that are on their way to the store.
-   */
-  private clearRequestsOnTheirWayToTheStore(request: GetRequest) {
-    this.getByHref(request.href).pipe(
-      filter((re: RequestEntry) => hasValue(re)),
-      take(1)
-    ).subscribe((re: RequestEntry) => {
-      if (!re.responsePending) {
-        remove(this.requestsOnTheirWayToTheStore, (item) => item === request.href);
-      }
-    });
-  }
-
   /**
    * Dispatch commit action to send all changes (for a certain method) to the server (buffer)
    * @param {RestRequestMethod} method RestRequestMethod for which the changes should be committed
@@ -285,50 +332,76 @@ export class RequestService {
   }
 
   /**
-   * Check whether a cached response should still be valid
+   * Check whether the request with the specified href is cached
    *
-   * @param entry
-   *    the entry to check
+   * @param href
+   *    The link of the request to check
+   * @param checkValidity
+   *    Whether or not to check the validity of an entry if one is found
    * @return boolean
-   *    false if the uuid has no value, the response was not successful or its time to
-   *    live was exceeded, true otherwise
+   *    true if a request with the specified href is cached and is valid (if checkValidity is true)
+   *    false otherwise
    */
-  private isValid(entry: RequestEntry): boolean {
-    if (hasValue(entry) && entry.completed && entry.response.isSuccessful) {
-      const timeOutdated = entry.response.timeAdded + entry.request.responseMsToLive;
-      const isOutDated = new Date().getTime() > timeOutdated;
-      return !isOutDated;
-    } else {
-      return false;
-    }
+  hasByHref(href: string, checkValidity = true): boolean {
+    let result = false;
+    /* NB: that this is only a solution because the select method is synchronous, see: https://github.com/ngrx/store/issues/296#issuecomment-269032571*/
+    this.hasByHref$(href, checkValidity)
+      .subscribe((hasByHref: boolean) => result = hasByHref)
+      .unsubscribe();
+    return result;
   }
 
   /**
    * Check whether the request with the specified href is cached
    *
    * @param href
+   *    The href of the request to check
+   * @param checkValidity
+   *    Whether or not to check the validity of an entry if one is found
+   * @return Observable<boolean>
+   *    true if a request with the specified href is cached and is valid (if checkValidity is true)
+   *    false otherwise
+   */
+  hasByHref$(href: string, checkValidity = true): Observable<boolean> {
+    return this.getByHref(href).pipe(
+      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry))
+    );
+  }
+
+  /**
+   * Check whether the request with the specified uuid is cached
+   *
+   * @param uuid
    *    The link of the request to check
+   * @param checkValidity
+   *    Whether or not to check the validity of an entry if one is found
    * @return boolean
-   *    true if the request with the specified href is cached,
+   *    true if a request with the specified uuid is cached and is valid (if checkValidity is true)
    *    false otherwise
    */
-  hasByHref(href: string): boolean {
+  hasByUUID(uuid: string, checkValidity = true): boolean {
     let result = false;
     /* NB: that this is only a solution because the select method is synchronous, see: https://github.com/ngrx/store/issues/296#issuecomment-269032571*/
-    this.getByHref(href).pipe(
-      take(1)
-    ).subscribe((requestEntry: RequestEntry) => result = this.isValid(requestEntry));
+    this.hasByUUID$(uuid, checkValidity)
+      .subscribe((hasByUUID: boolean) => result = hasByUUID)
+      .unsubscribe();
     return result;
   }
 
   /**
-   * Create an observable that emits a new value whenever the availability of the cached request changes.
-   * The value it emits is a boolean stating if the request exists in cache or not.
-   * @param href  The href of the request to observe
+   * Check whether the request with the specified uuid is cached
+   *
+   * @param uuid
+   *    The uuid of the request to check
+   * @param checkValidity
+   *    Whether or not to check the validity of an entry if one is found
+   * @return Observable<boolean>
+   *    true if a request with the specified uuid is cached and is valid (if checkValidity is true)
+   *    false otherwise
    */
-  hasByHrefObservable(href: string): Observable<boolean> {
-    return this.getByHref(href).pipe(
-      map((requestEntry: RequestEntry) => this.isValid(requestEntry))
+  hasByUUID$(uuid: string, checkValidity = true): Observable<boolean> {
+    return this.getByUUID(uuid).pipe(
+      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry))
     );
   }
 
diff --git a/src/app/core/data/resource-policy.service.ts b/src/app/core/data/resource-policy.service.ts
deleted file mode 100644
index f66032925e1..00000000000
--- a/src/app/core/data/resource-policy.service.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../cache/builders/build-decorators';
-
-import { DataService } from '../data/data.service';
-import { RequestService } from '../data/request.service';
-import { FindListOptions } from '../data/request.models';
-import { Collection } from '../shared/collection.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ResourcePolicy } from '../shared/resource-policy.model';
-import { RemoteData } from '../data/remote-data';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { CoreState } from '../core.reducers';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RESOURCE_POLICY } from '../shared/resource-policy.resource-type';
-import { ChangeAnalyzer } from './change-analyzer';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
-
-/* tslint:disable:max-classes-per-file */
-
-/**
- * A private DataService implementation to delegate specific methods to.
- */
-class DataServiceImpl extends DataService<ResourcePolicy> {
-  protected linkPath = 'resourcepolicies';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: ChangeAnalyzer<ResourcePolicy>) {
-    super();
-  }
-
-}
-
-/**
- * A service responsible for fetching/sending data from/to the REST API on the resourcepolicies endpoint
- */
-@Injectable()
-@dataService(RESOURCE_POLICY)
-export class ResourcePolicyService {
-  private dataService: DataServiceImpl;
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<ResourcePolicy>) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
-  }
-
-  /**
-   * Returns an observable of {@link RemoteData} of a {@link ResourcePolicy}, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the {@link ResourcePolicy}
-   * @param href            The url of {@link ResourcePolicy} we want to retrieve
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  findByHref(href: string, ...linksToFollow: Array<FollowLinkConfig<ResourcePolicy>>): Observable<RemoteData<ResourcePolicy>> {
-    return this.dataService.findByHref(href, ...linksToFollow);
-  }
-
-  /**
-   * Returns a list of observables of {@link RemoteData} of {@link ResourcePolicy}s, based on an href, with a list of {@link FollowLinkConfig},
-   * to automatically resolve {@link HALLink}s of the {@link ResourcePolicy}
-   * @param href            The url of the {@link ResourcePolicy} we want to retrieve
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  findAllByHref(href: string, findListOptions: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<ResourcePolicy>>): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
-    return this.dataService.findAllByHref(href, findListOptions, ...linksToFollow);
-  }
-
-  /**
-   * Return the defaultAccessConditions {@link ResourcePolicy} list for a given {@link Collection}
-   *
-   * @param collection the {@link Collection} to retrieve the defaultAccessConditions for
-   * @param findListOptions the {@link FindListOptions} for the request
-   */
-  getDefaultAccessConditionsFor(collection: Collection, findListOptions?: FindListOptions): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
-    return this.dataService.findAllByHref(collection._links.defaultAccessConditions.href, findListOptions);
-  }
-}
diff --git a/src/app/core/data/root.model.ts b/src/app/core/data/root.model.ts
new file mode 100644
index 00000000000..68325dae307
--- /dev/null
+++ b/src/app/core/data/root.model.ts
@@ -0,0 +1,49 @@
+import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { ROOT } from './root.resource-type';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { autoserialize, deserialize } from 'cerialize';
+import { ResourceType } from '../shared/resource-type';
+import { HALLink } from '../shared/hal-link.model';
+
+/**
+ * The root rest api resource
+ */
+@typedObject
+export class Root implements CacheableObject {
+  static type = ROOT;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The url for the dspace UI
+   */
+  @autoserialize
+  dspaceUI: string;
+
+  /**
+   * The repository Name
+   */
+  @autoserialize
+  dspaceName: string;
+
+  /**
+   * The url for the rest api
+   */
+  @autoserialize
+  dspaceServer: string;
+
+  /**
+   * The {@link HALLink}s for the root object
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+    [k: string]: HALLink | HALLink[];
+  }
+}
diff --git a/src/app/core/data/root.resource-type.ts b/src/app/core/data/root.resource-type.ts
new file mode 100644
index 00000000000..6f94e2ceaf1
--- /dev/null
+++ b/src/app/core/data/root.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../shared/resource-type';
+
+/**
+ * The resource type for the root endpoint
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ROOT = new ResourceType('root');
diff --git a/src/app/core/data/search-response-parsing.service.ts b/src/app/core/data/search-response-parsing.service.ts
index ed472509225..9dff8876e04 100644
--- a/src/app/core/data/search-response-parsing.service.ts
+++ b/src/app/core/data/search-response-parsing.service.ts
@@ -1,20 +1,16 @@
 import { Injectable } from '@angular/core';
 import { hasValue } from '../../shared/empty.util';
-import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
-import { RestResponse, SearchSuccessResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { SearchObjects } from '../../shared/search/search-objects.model';
+import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { MetadataMap, MetadataValue } from '../shared/metadata.models';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 
 @Injectable()
-export class SearchResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+export class SearchResponseParsingService extends DspaceRestResponseParsingService {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
     // fallback for unexpected empty response
     const emptyPayload = {
       _embedded : {
@@ -42,13 +38,9 @@ export class SearchResponseParsingService implements ResponseParsingService {
     const dsoSelfLinks = payload._embedded.objects
       .filter((object) => hasValue(object._embedded))
       .map((object) => object._embedded.indexableObject)
-      .map((dso) => this.dsoParser.parse(request, {
-        payload: dso,
-        statusCode: data.statusCode,
-        statusText: data.statusText
-      }))
-      .map((obj) => obj.resourceSelfLinks)
-      .reduce((combined, thisElement) => [...combined, ...thisElement], []);
+      .map((dso) => this.process(dso, request))
+      .map((obj) => obj._links.self.href)
+      .reduce((combined, thisElement) => [...combined, thisElement], []);
 
     const objects = payload._embedded.objects
       .filter((object) => hasValue(object._embedded))
@@ -57,7 +49,9 @@ export class SearchResponseParsingService implements ResponseParsingService {
         hitHighlights: hitHighlights[index],
       }));
     payload.objects = objects;
-    const deserialized = new DSpaceSerializer(SearchQueryResponse).deserialize(payload);
-    return new SearchSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(payload));
+    const deserialized = new DSpaceSerializer(SearchObjects).deserialize(payload);
+    deserialized.pageInfo = this.processPageInfo(payload);
+    this.addToObjectCache(deserialized, request, data);
+    return new ParsedResponse(data.statusCode, deserialized._links.self);
   }
 }
diff --git a/src/app/core/data/site-data.service.spec.ts b/src/app/core/data/site-data.service.spec.ts
index 6938cd65a97..354593fce1a 100644
--- a/src/app/core/data/site-data.service.spec.ts
+++ b/src/app/core/data/site-data.service.spec.ts
@@ -9,13 +9,10 @@ import { CoreState } from '../core.reducers';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../cache/response.models';
-import { RequestEntry } from './request.reducer';
 import { FindListOptions } from './request.models';
 import { TestScheduler } from 'rxjs/testing';
-import { PaginatedList } from './paginated-list';
-import { RemoteData } from './remote-data';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 describe('SiteDataService', () => {
   let scheduler: TestScheduler;
@@ -32,12 +29,6 @@ describe('SiteDataService', () => {
   const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
   const options = Object.assign(new FindListOptions(), {});
 
-  const getRequestEntry$ = (successful: boolean, statusCode: number, statusText: string) => {
-    return observableOf({
-      response: new RestResponse(successful, statusCode, statusText)
-    } as RequestEntry);
-  };
-
   const siteLink = 'https://rest.api/rest/api/config/sites';
 
   beforeEach(() => {
@@ -49,11 +40,10 @@ describe('SiteDataService', () => {
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
       configure: true,
-      getByHref: getRequestEntry$(true, 200, 'Success')
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildList: cold('a', {
-        a: new RemoteData(false, false, true, undefined, new PaginatedList(null, [testObject]))
+        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject]))
       })
     });
 
@@ -89,7 +79,7 @@ describe('SiteDataService', () => {
     it('should return the Site object', () => {
 
       spyOn(service, 'findAll').and.returnValue(cold('a', {
-        a: new RemoteData(false, false, true, undefined, new PaginatedList(null, [testObject]))
+        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject]))
       }));
 
       const expected = cold('(b|)', {b: testObject});
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
index 7b2bfdb543e..a91b599e58f 100644
--- a/src/app/core/data/site-data.service.ts
+++ b/src/app/core/data/site-data.service.ts
@@ -9,12 +9,12 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core.reducers';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getSucceededRemoteData } from '../shared/operators';
+import { getFirstSucceededRemoteData } from '../shared/operators';
 import { Site } from '../shared/site.model';
 import { SITE } from '../shared/site.resource-type';
 import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
 
@@ -23,7 +23,7 @@ import { RequestService } from './request.service';
  */
 @Injectable()
 @dataService(SITE)
-export class SiteDataService extends DataService<Site> {​
+export class SiteDataService extends DataService<Site> {
   protected linkPath = 'sites';
 
   constructor(
@@ -44,7 +44,7 @@ export class SiteDataService extends DataService<Site> {​
    */
   find(): Observable<Site> {
     return this.findAll().pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((remoteData: RemoteData<PaginatedList<Site>>) => remoteData.payload),
       map((list: PaginatedList<Site>) => list.page[0])
     );
diff --git a/src/app/core/data/status-code-only-response-parsing.service.ts b/src/app/core/data/status-code-only-response-parsing.service.ts
index b9812dcfee4..4f0030371f6 100644
--- a/src/app/core/data/status-code-only-response-parsing.service.ts
+++ b/src/app/core/data/status-code-only-response-parsing.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 
@@ -19,7 +19,7 @@ export class StatusCodeOnlyResponseParsingService implements ResponseParsingServ
    * @param request The request that was sent to the server
    * @param data The response to parse
    */
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+  parse(request: RestRequest, data: RawRestResponse): RestResponse {
     const isSuccessful = data.statusCode >= 200 && data.statusCode < 300;
     return new RestResponse(isSuccessful, data.statusCode, data.statusText);
   }
diff --git a/src/app/core/data/update-data.service.ts b/src/app/core/data/update-data.service.ts
new file mode 100644
index 00000000000..20339411ad9
--- /dev/null
+++ b/src/app/core/data/update-data.service.ts
@@ -0,0 +1,13 @@
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from './remote-data';
+import { RestRequestMethod } from './rest-request-method';
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Represents a data service to update a given object
+ */
+export interface UpdateDataService<T> {
+  patch(dso: T, operations: Operation[]): Observable<RemoteData<T>>;
+  update(object: T): Observable<RemoteData<T>>;
+  commitUpdates(method?: RestRequestMethod);
+}
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index b4107d629d9..3092954da16 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -14,7 +14,7 @@ import { FindListOptions, GetRequest } from './request.models';
 import { Observable } from 'rxjs/internal/Observable';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list';
+import { PaginatedList } from './paginated-list.model';
 import { Version } from '../shared/version.model';
 import { map, switchMap, take } from 'rxjs/operators';
 import { dataService } from '../cache/builders/build-decorators';
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.schema.json b/src/app/core/dspace-rest/dspace-rest.schema.json
similarity index 98%
rename from src/app/core/dspace-rest-v2/dspace-rest-v2.schema.json
rename to src/app/core/dspace-rest/dspace-rest.schema.json
index 9539addeb2e..92929b9445c 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.schema.json
+++ b/src/app/core/dspace-rest/dspace-rest.schema.json
@@ -1,5 +1,5 @@
 {
-  "title": "DSpace REST v2 json-schema",
+  "title": "DSpace Rest json-schema",
   "description": "Based on http://hyperschema.org/mediatypes/hal",
   "type": "object",
   "properties": {
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.spec.ts b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
similarity index 75%
rename from src/app/core/dspace-rest-v2/dspace-rest-v2.service.spec.ts
rename to src/app/core/dspace-rest/dspace-rest.service.spec.ts
index a7aba56a3bc..3c1d37350d6 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.spec.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 
-import { DEFAULT_CONTENT_TYPE, DSpaceRESTv2Service } from './dspace-rest-v2.service';
+import { DEFAULT_CONTENT_TYPE, DspaceRestService } from './dspace-rest.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { RestRequestMethod } from '../data/rest-request-method';
 import { HttpHeaders } from '@angular/common/http';
 
-describe('DSpaceRESTv2Service', () => {
-  let dSpaceRESTv2Service: DSpaceRESTv2Service;
+describe('DspaceRestService', () => {
+  let dspaceRestService: DspaceRestService;
   let httpMock: HttpTestingController;
   const url = 'http://www.dspace.org/';
   const mockError: any = {
@@ -19,28 +19,28 @@ describe('DSpaceRESTv2Service', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
-      providers: [DSpaceRESTv2Service]
+      providers: [DspaceRestService]
     });
 
-    dSpaceRESTv2Service = TestBed.get(DSpaceRESTv2Service);
+    dspaceRestService = TestBed.get(DspaceRestService);
     httpMock = TestBed.get(HttpTestingController);
   });
 
   afterEach(() => httpMock.verify());
 
-  it('should be created', inject([DSpaceRESTv2Service], (service: DSpaceRESTv2Service) => {
+  it('should be created', inject([DspaceRestService], (service: DspaceRestService) => {
     expect(service).toBeTruthy();
   }));
 
   describe('#get', () => {
-    it('should return an Observable<DSpaceRESTV2Response>', () => {
+    it('should return an Observable<RawRestResponse>', () => {
       const mockPayload = {
         page: 1
       };
       const mockStatusCode = 200;
       const mockStatusText = 'GREAT';
 
-      dSpaceRESTv2Service.get(url).subscribe((response) => {
+      dspaceRestService.get(url).subscribe((response) => {
         expect(response).toBeTruthy();
         expect(response.statusCode).toEqual(mockStatusCode);
         expect(response.statusText).toEqual(mockStatusText);
@@ -52,7 +52,7 @@ describe('DSpaceRESTv2Service', () => {
       req.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
     });
     it('should throw an error', () => {
-      dSpaceRESTv2Service.get(url).subscribe(() => undefined, (err) => {
+      dspaceRestService.get(url).subscribe(() => undefined, (err) => {
         expect(err).toEqual(mockError);
       });
       const req = httpMock.expectOne(url);
@@ -63,7 +63,7 @@ describe('DSpaceRESTv2Service', () => {
     it('should log an error', () => {
       spyOn(console, 'log');
 
-      dSpaceRESTv2Service.get(url).subscribe(() => undefined, (err) => {
+      dspaceRestService.get(url).subscribe(() => undefined, (err) => {
         expect(console.log).toHaveBeenCalled();
       });
 
@@ -73,7 +73,7 @@ describe('DSpaceRESTv2Service', () => {
     });
 
     it('when no content-type header is provided, it should use application/json', () => {
-      dSpaceRESTv2Service.request(RestRequestMethod.POST, url, {}).subscribe();
+      dspaceRestService.request(RestRequestMethod.POST, url, {}).subscribe();
 
       const req = httpMock.expectOne(url);
       expect(req.request.headers.get('Content-Type')).toContain(DEFAULT_CONTENT_TYPE);
@@ -81,14 +81,14 @@ describe('DSpaceRESTv2Service', () => {
   });
 
   describe('#request', () => {
-    it('should return an Observable<DSpaceRESTV2Response>', () => {
+    it('should return an Observable<RawRestResponse>', () => {
       const mockPayload = {
         page: 1
       };
       const mockStatusCode = 200;
       const mockStatusText = 'GREAT';
 
-      dSpaceRESTv2Service.request(RestRequestMethod.POST, url, {}).subscribe((response) => {
+      dspaceRestService.request(RestRequestMethod.POST, url, {}).subscribe((response) => {
         expect(response).toBeTruthy();
         expect(response.statusCode).toEqual(mockStatusCode);
         expect(response.statusText).toEqual(mockStatusText);
@@ -103,14 +103,14 @@ describe('DSpaceRESTv2Service', () => {
     it('when a content-type header is provided, it should not use application/json', () => {
       let headers = new HttpHeaders();
       headers = headers.set('Content-Type', 'text/html');
-      dSpaceRESTv2Service.request(RestRequestMethod.POST, url, {}, { headers }).subscribe();
+      dspaceRestService.request(RestRequestMethod.POST, url, {}, { headers }).subscribe();
 
       const req = httpMock.expectOne(url);
       expect(req.request.headers.get('Content-Type')).not.toContain(DEFAULT_CONTENT_TYPE);
     });
 
     it('when no content-type header is provided, it should use application/json', () => {
-      dSpaceRESTv2Service.request(RestRequestMethod.POST, url, {}).subscribe();
+      dspaceRestService.request(RestRequestMethod.POST, url, {}).subscribe();
 
       const req = httpMock.expectOne(url);
       expect(req.request.headers.get('Content-Type')).toContain(DEFAULT_CONTENT_TYPE);
@@ -123,7 +123,7 @@ describe('DSpaceRESTv2Service', () => {
       const dso: DSpaceObject = {
         name: name
       } as DSpaceObject;
-      const formdata = dSpaceRESTv2Service.buildFormData(dso);
+      const formdata = dspaceRestService.buildFormData(dso);
       expect(formdata.get('name')).toBe(name);
     });
   });
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
similarity index 85%
rename from src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
rename to src/app/core/dspace-rest/dspace-rest.service.ts
index 6eb144580cb..18fca0054a2 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -3,9 +3,9 @@ import { catchError, map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http'
 
-import { DSpaceRESTV2Response } from './dspace-rest-v2-response.model';
+import { RawRestResponse } from './raw-rest-response.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { hasNoValue, isNotEmpty } from '../../shared/empty.util';
+import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
 
 export const DEFAULT_CONTENT_TYPE = 'application/json; charset=utf-8';
@@ -23,7 +23,7 @@ export interface HttpOptions {
  * Service to access DSpace's REST API
  */
 @Injectable()
-export class DSpaceRESTv2Service {
+export class DspaceRestService {
 
   constructor(protected http: HttpClient) {
 
@@ -37,7 +37,7 @@ export class DSpaceRESTv2Service {
    * @return {Observable<string>}
    *      An Observable<string> containing the response from the server
    */
-  get(absoluteURL: string): Observable<DSpaceRESTV2Response> {
+  get(absoluteURL: string): Observable<RawRestResponse> {
     const requestOptions = {
       observe: 'response' as any,
       headers: new HttpHeaders({'Content-Type': DEFAULT_CONTENT_TYPE})
@@ -53,7 +53,7 @@ export class DSpaceRESTv2Service {
         return observableThrowError({
           statusCode: err.status,
           statusText: err.statusText,
-          message: err.message
+          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
         });
       }));
   }
@@ -69,10 +69,12 @@ export class DSpaceRESTv2Service {
    *    an optional body for the request
    * @param options
    *    the HttpOptions object
+   * @param isMultipart
+   *     true when this concerns a multipart request
    * @return {Observable<string>}
    *      An Observable<string> containing the response from the server
    */
-  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions): Observable<DSpaceRESTV2Response> {
+  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions, isMultipart?: boolean): Observable<RawRestResponse> {
     const requestOptions: HttpOptions = {};
     requestOptions.body = body;
     if (method === RestRequestMethod.POST && isNotEmpty(body) && isNotEmpty(body.name)) {
@@ -98,7 +100,7 @@ export class DSpaceRESTv2Service {
       requestOptions.withCredentials = options.withCredentials;
     }
 
-    if (!requestOptions.headers.has('Content-Type')) {
+    if (!requestOptions.headers.has('Content-Type') && !isMultipart) {
       // Because HttpHeaders is immutable, the set method returns a new object instead of updating the existing headers
       requestOptions.headers = requestOptions.headers.set('Content-Type', DEFAULT_CONTENT_TYPE);
     }
@@ -110,11 +112,10 @@ export class DSpaceRESTv2Service {
         statusText: res.statusText
       })),
       catchError((err) => {
-        console.log('Error: ', err);
         return observableThrowError({
           statusCode: err.status,
           statusText: err.statusText,
-          message: err.message
+          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
         });
       }));
   }
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.validator.ts b/src/app/core/dspace-rest/dspace-rest.validator.ts
similarity index 81%
rename from src/app/core/dspace-rest-v2/dspace-rest-v2.validator.ts
rename to src/app/core/dspace-rest/dspace-rest.validator.ts
index c176b1eee39..6826ecb9c2a 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.validator.ts
+++ b/src/app/core/dspace-rest/dspace-rest.validator.ts
@@ -1,12 +1,12 @@
 import { Validator } from 'jsonschema';
 
-import schema from './dspace-rest-v2.schema.json'
+import schema from './dspace-rest.schema.json'
 
 /**
  * Verifies a document is a valid response from
- * a DSpace REST API v2
+ * a DSpace REST API
  */
-export class DSpaceRESTv2Validator {
+export class DspaceRestValidator {
 
   constructor(private document: any) {
 
@@ -14,7 +14,7 @@ export class DSpaceRESTv2Validator {
 
   /**
    * Throws an exception if this.document isn't a valid response from
-   * a DSpace REST API v2. Succeeds otherwise.
+   * a DSpace REST API. Succeeds otherwise.
    */
   validate(): void {
     const validator = new Validator();
diff --git a/src/app/core/dspace-rest-v2/dspace.serializer.spec.ts b/src/app/core/dspace-rest/dspace.serializer.spec.ts
similarity index 98%
rename from src/app/core/dspace-rest-v2/dspace.serializer.spec.ts
rename to src/app/core/dspace-rest/dspace.serializer.spec.ts
index b07a4f97d11..315a88d6c48 100644
--- a/src/app/core/dspace-rest-v2/dspace.serializer.spec.ts
+++ b/src/app/core/dspace-rest/dspace.serializer.spec.ts
@@ -1,4 +1,4 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import { autoserialize, deserialize } from 'cerialize';
 import { HALLink } from '../shared/hal-link.model';
 import { HALResource } from '../shared/hal-resource.model';
 import { DSpaceSerializer } from './dspace.serializer';
diff --git a/src/app/core/dspace-rest-v2/dspace.serializer.ts b/src/app/core/dspace-rest/dspace.serializer.ts
similarity index 96%
rename from src/app/core/dspace-rest-v2/dspace.serializer.ts
rename to src/app/core/dspace-rest/dspace.serializer.ts
index e16094a040c..f77818a8f5a 100644
--- a/src/app/core/dspace-rest-v2/dspace.serializer.ts
+++ b/src/app/core/dspace-rest/dspace.serializer.ts
@@ -4,7 +4,7 @@ import { Serializer } from '../serializer';
 import { GenericConstructor } from '../shared/generic-constructor';
 
 /**
- * This Serializer turns responses from v2 of DSpace's REST API
+ * This Serializer turns responses from DSpace's REST API
  * to models and vice versa
  */
 export class DSpaceSerializer<T> implements Serializer<T> {
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts b/src/app/core/dspace-rest/raw-rest-response.model.ts
similarity index 84%
rename from src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts
rename to src/app/core/dspace-rest/raw-rest-response.model.ts
index d09d398d7cd..e8fdfbbf277 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts
+++ b/src/app/core/dspace-rest/raw-rest-response.model.ts
@@ -1,6 +1,6 @@
 import { HttpHeaders } from '@angular/common/http';
 
-export interface DSpaceRESTV2Response {
+export interface RawRestResponse {
   payload: {
     [name: string]: any;
     _embedded?: any;
diff --git a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
new file mode 100644
index 00000000000..ee07da004bb
--- /dev/null
+++ b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
@@ -0,0 +1,32 @@
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/operators';
+
+/**
+ * An abstract guard for redirecting users to the user agreement page if a certain condition is met
+ * That condition is defined by abstract method hasAccepted
+ */
+export abstract class AbstractEndUserAgreementGuard implements CanActivate {
+
+  constructor(protected router: Router) {
+  }
+
+  /**
+   * True when the user agreement has been accepted
+   * The user will be redirected to the End User Agreement page if they haven't accepted it before
+   * A redirect URL will be provided with the navigation so the component can redirect the user back to the blocked route
+   * when they're finished accepting the agreement
+   */
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
+    return this.hasAccepted().pipe(
+      returnEndUserAgreementUrlTreeOnFalse(this.router, state.url)
+    );
+  }
+
+  /**
+   * This abstract method determines how the User Agreement has to be accepted before the user is allowed to visit
+   * the desired route
+   */
+  abstract hasAccepted(): Observable<boolean>;
+
+}
diff --git a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
new file mode 100644
index 00000000000..805c7658323
--- /dev/null
+++ b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
@@ -0,0 +1,47 @@
+import { EndUserAgreementService } from './end-user-agreement.service';
+import { Router, UrlTree } from '@angular/router';
+import { EndUserAgreementCookieGuard } from './end-user-agreement-cookie.guard';
+
+describe('EndUserAgreementCookieGuard', () => {
+  let guard: EndUserAgreementCookieGuard;
+
+  let endUserAgreementService: EndUserAgreementService;
+  let router: Router;
+
+  beforeEach(() => {
+    endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
+      isCookieAccepted: true
+    });
+    router = jasmine.createSpyObj('router', {
+      navigateByUrl: {},
+      parseUrl: new UrlTree(),
+      createUrlTree: new UrlTree()
+    });
+
+    guard = new EndUserAgreementCookieGuard(endUserAgreementService, router);
+  });
+
+  describe('canActivate', () => {
+    describe('when the cookie has been accepted', () => {
+      it('should return true', (done) => {
+        guard.canActivate(undefined, { url: Object.assign({ url: 'redirect' }) } as any).subscribe((result) => {
+          expect(result).toEqual(true);
+          done();
+        });
+      });
+    });
+
+    describe('when the cookie hasn\'t been accepted', () => {
+      beforeEach(() => {
+        (endUserAgreementService.isCookieAccepted as jasmine.Spy).and.returnValue(false);
+      });
+
+      it('should return a UrlTree', (done) => {
+        guard.canActivate(undefined, Object.assign({ url: 'redirect' })).subscribe((result) => {
+          expect(result).toEqual(jasmine.any(UrlTree));
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
new file mode 100644
index 00000000000..e6461859f30
--- /dev/null
+++ b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
@@ -0,0 +1,26 @@
+import { Injectable } from '@angular/core';
+import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
+import { Observable } from 'rxjs/internal/Observable';
+import { of as observableOf } from 'rxjs';
+import { EndUserAgreementService } from './end-user-agreement.service';
+import { Router } from '@angular/router';
+
+/**
+ * A guard redirecting users to the end agreement page when the user agreement cookie hasn't been accepted
+ */
+@Injectable()
+export class EndUserAgreementCookieGuard extends AbstractEndUserAgreementGuard {
+
+  constructor(protected endUserAgreementService: EndUserAgreementService,
+              protected router: Router) {
+    super(router);
+  }
+
+  /**
+   * True when the user agreement cookie has been accepted
+   */
+  hasAccepted(): Observable<boolean> {
+    return observableOf(this.endUserAgreementService.isCookieAccepted());
+  }
+
+}
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
new file mode 100644
index 00000000000..1892509aefe
--- /dev/null
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
@@ -0,0 +1,49 @@
+import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-user.guard';
+import { EndUserAgreementService } from './end-user-agreement.service';
+import { Router, UrlTree } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../auth/auth.service';
+
+describe('EndUserAgreementGuard', () => {
+  let guard: EndUserAgreementCurrentUserGuard;
+
+  let endUserAgreementService: EndUserAgreementService;
+  let router: Router;
+
+  beforeEach(() => {
+    endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
+      hasCurrentUserAcceptedAgreement: observableOf(true)
+    });
+    router = jasmine.createSpyObj('router', {
+      navigateByUrl: {},
+      parseUrl: new UrlTree(),
+      createUrlTree: new UrlTree()
+    });
+
+    guard = new EndUserAgreementCurrentUserGuard(endUserAgreementService, router);
+  });
+
+  describe('canActivate', () => {
+    describe('when the user has accepted the agreement', () => {
+      it('should return true', (done) => {
+        guard.canActivate(undefined, Object.assign({ url: 'redirect' })).subscribe((result) => {
+          expect(result).toEqual(true);
+          done();
+        });
+      });
+    });
+
+    describe('when the user hasn\'t accepted the agreement', () => {
+      beforeEach(() => {
+        (endUserAgreementService.hasCurrentUserAcceptedAgreement as jasmine.Spy).and.returnValue(observableOf(false));
+      });
+
+      it('should return a UrlTree', (done) => {
+        guard.canActivate(undefined, Object.assign({ url: 'redirect' })).subscribe((result) => {
+          expect(result).toEqual(jasmine.any(UrlTree));
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
new file mode 100644
index 00000000000..348a3285cc5
--- /dev/null
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
+import { EndUserAgreementService } from './end-user-agreement.service';
+import { Router } from '@angular/router';
+
+/**
+ * A guard redirecting logged in users to the end agreement page when they haven't accepted the latest user agreement
+ */
+@Injectable()
+export class EndUserAgreementCurrentUserGuard extends AbstractEndUserAgreementGuard {
+
+  constructor(protected endUserAgreementService: EndUserAgreementService,
+              protected router: Router) {
+    super(router);
+  }
+
+  /**
+   * True when the currently logged in user has accepted the agreements or when the user is not currently authenticated
+   */
+  hasAccepted(): Observable<boolean> {
+    return this.endUserAgreementService.hasCurrentUserAcceptedAgreement(true);
+  }
+
+}
diff --git a/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts b/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
new file mode 100644
index 00000000000..c95a175d4bb
--- /dev/null
+++ b/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
@@ -0,0 +1,138 @@
+import {
+  END_USER_AGREEMENT_COOKIE,
+  END_USER_AGREEMENT_METADATA_FIELD,
+  EndUserAgreementService
+} from './end-user-agreement.service';
+import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
+import { of as observableOf } from 'rxjs';
+import { EPerson } from '../eperson/models/eperson.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RestResponse } from '../cache/response.models';
+
+describe('EndUserAgreementService', () => {
+  let service: EndUserAgreementService;
+
+  let userWithMetadata: EPerson;
+  let userWithoutMetadata: EPerson;
+
+  let cookie;
+  let authService;
+  let ePersonService;
+
+  beforeEach(() => {
+    userWithMetadata = Object.assign(new EPerson(), {
+      metadata: {
+        [END_USER_AGREEMENT_METADATA_FIELD]: [
+          {
+            value: 'true'
+          }
+        ]
+      }
+    });
+    userWithoutMetadata = Object.assign(new EPerson());
+
+    cookie = new CookieServiceMock();
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      getAuthenticatedUserFromStore: observableOf(userWithMetadata)
+    });
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      update: createSuccessfulRemoteDataObject$(userWithMetadata),
+      patch: createSuccessfulRemoteDataObject$({})
+    });
+
+    service = new EndUserAgreementService(cookie, authService, ePersonService);
+  });
+
+  describe('when the cookie is set to true', () => {
+    beforeEach(() => {
+      cookie.set(END_USER_AGREEMENT_COOKIE, true);
+    });
+
+    it('hasCurrentUserOrCookieAcceptedAgreement should return true', (done) => {
+      service.hasCurrentUserOrCookieAcceptedAgreement(false).subscribe((result) => {
+        expect(result).toEqual(true);
+        done();
+      });
+    });
+
+    it('isCookieAccepted should return true', () => {
+      expect(service.isCookieAccepted()).toEqual(true);
+    });
+
+    it('removeCookieAccepted should remove the cookie', () => {
+      service.removeCookieAccepted();
+      expect(cookie.get(END_USER_AGREEMENT_COOKIE)).toBeUndefined();
+    });
+  });
+
+  describe('when the cookie isn\'t set', () => {
+    describe('and the user is authenticated', () => {
+      beforeEach(() => {
+        (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(true));
+      });
+
+      describe('and the user contains agreement metadata', () => {
+        beforeEach(() => {
+          (authService.getAuthenticatedUserFromStore as jasmine.Spy).and.returnValue(observableOf(userWithMetadata));
+        });
+
+        it('hasCurrentUserOrCookieAcceptedAgreement should return true', (done) => {
+          service.hasCurrentUserOrCookieAcceptedAgreement(false).subscribe((result) => {
+            expect(result).toEqual(true);
+            done();
+          });
+        });
+      });
+
+      describe('and the user doesn\'t contain agreement metadata', () => {
+        beforeEach(() => {
+          (authService.getAuthenticatedUserFromStore as jasmine.Spy).and.returnValue(observableOf(userWithoutMetadata));
+        });
+
+        it('hasCurrentUserOrCookieAcceptedAgreement should return false', (done) => {
+          service.hasCurrentUserOrCookieAcceptedAgreement(false).subscribe((result) => {
+            expect(result).toEqual(false);
+            done();
+          });
+        });
+      });
+
+      it('setUserAcceptedAgreement should update the user with new metadata', (done) => {
+        service.setUserAcceptedAgreement(true).subscribe(() => {
+          expect(ePersonService.patch).toHaveBeenCalled();
+          done();
+        });
+      });
+    });
+
+    describe('and the user is not authenticated', () => {
+      beforeEach(() => {
+        (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false));
+      });
+
+      it('hasCurrentUserOrCookieAcceptedAgreement should return false', (done) => {
+        service.hasCurrentUserOrCookieAcceptedAgreement(false).subscribe((result) => {
+          expect(result).toEqual(false);
+          done();
+        });
+      });
+
+      it('setUserAcceptedAgreement should set the cookie to true', (done) => {
+        service.setUserAcceptedAgreement(true).subscribe(() => {
+          expect(cookie.get(END_USER_AGREEMENT_COOKIE)).toEqual(true);
+          done();
+        });
+      });
+    });
+
+    it('isCookieAccepted should return false', () => {
+      expect(service.isCookieAccepted()).toEqual(false);
+    });
+
+    it('setCookieAccepted should set the cookie', () => {
+      service.setCookieAccepted(true);
+      expect(cookie.get(END_USER_AGREEMENT_COOKIE)).toEqual(true);
+    });
+  });
+});
diff --git a/src/app/core/end-user-agreement/end-user-agreement.service.ts b/src/app/core/end-user-agreement/end-user-agreement.service.ts
new file mode 100644
index 00000000000..43569da9f4a
--- /dev/null
+++ b/src/app/core/end-user-agreement/end-user-agreement.service.ts
@@ -0,0 +1,113 @@
+import { Injectable } from '@angular/core';
+import { AuthService } from '../auth/auth.service';
+import { CookieService } from '../services/cookie.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { of as observableOf } from 'rxjs';
+import { map, switchMap, take } from 'rxjs/operators';
+import { hasValue } from '../../shared/empty.util';
+import { EPersonDataService } from '../eperson/eperson-data.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+
+export const END_USER_AGREEMENT_COOKIE = 'hasAgreedEndUser';
+export const END_USER_AGREEMENT_METADATA_FIELD = 'dspace.agreements.end-user';
+
+/**
+ * Service for checking and managing the status of the current end user agreement
+ */
+@Injectable()
+export class EndUserAgreementService {
+
+  constructor(protected cookie: CookieService,
+              protected authService: AuthService,
+              protected ePersonService: EPersonDataService) {
+  }
+
+  /**
+   * Whether or not either the cookie was accepted or the current user has accepted the End User Agreement
+   * @param acceptedWhenAnonymous Whether or not the user agreement should be considered accepted if the user is
+   *                              currently not authenticated (anonymous)
+   */
+  hasCurrentUserOrCookieAcceptedAgreement(acceptedWhenAnonymous: boolean): Observable<boolean> {
+    if (this.isCookieAccepted()) {
+      return observableOf(true);
+    } else {
+      return this.hasCurrentUserAcceptedAgreement(acceptedWhenAnonymous);
+    }
+  }
+
+  /**
+   * Whether or not the current user has accepted the End User Agreement
+   * @param acceptedWhenAnonymous Whether or not the user agreement should be considered accepted if the user is
+   *                              currently not authenticated (anonymous)
+   */
+  hasCurrentUserAcceptedAgreement(acceptedWhenAnonymous: boolean): Observable<boolean> {
+    return this.authService.isAuthenticated().pipe(
+      switchMap((authenticated) => {
+        if (authenticated) {
+          return this.authService.getAuthenticatedUserFromStore().pipe(
+            map((user) => hasValue(user) && user.hasMetadata(END_USER_AGREEMENT_METADATA_FIELD) && user.firstMetadata(END_USER_AGREEMENT_METADATA_FIELD).value === 'true')
+          );
+        } else {
+          return observableOf(acceptedWhenAnonymous);
+        }
+      })
+    );
+  }
+
+  /**
+   * Set the current user's accepted agreement status
+   * When a user is authenticated, set his/her metadata to the provided value
+   * When no user is authenticated, set the cookie to the provided value
+   * @param accepted
+   */
+  setUserAcceptedAgreement(accepted: boolean): Observable<boolean> {
+    return this.authService.isAuthenticated().pipe(
+      switchMap((authenticated) => {
+        if (authenticated) {
+          return this.authService.getAuthenticatedUserFromStore().pipe(
+            take(1),
+            switchMap((user) => {
+              const newValue = { value: String(accepted) };
+              let operation;
+              if (user.hasMetadata(END_USER_AGREEMENT_METADATA_FIELD)) {
+                operation = { op: 'replace', path: `/metadata/${END_USER_AGREEMENT_METADATA_FIELD}/0`, value: newValue };
+              } else {
+                operation = { op: 'add', path: `/metadata/${END_USER_AGREEMENT_METADATA_FIELD}`, value: [ newValue ] };
+              }
+              return this.ePersonService.patch(user, [operation]);
+            }),
+            getFirstCompletedRemoteData(),
+            map((response) => response.hasSucceeded)
+          );
+        } else {
+          this.setCookieAccepted(accepted);
+          return observableOf(true);
+        }
+      }),
+      take(1)
+    );
+  }
+
+  /**
+   * Is the End User Agreement accepted in the cookie?
+   */
+  isCookieAccepted(): boolean {
+    return this.cookie.get(END_USER_AGREEMENT_COOKIE) === true;
+  }
+
+  /**
+   * Set the cookie's End User Agreement accepted state
+   * @param accepted
+   */
+  setCookieAccepted(accepted: boolean) {
+    this.cookie.set(END_USER_AGREEMENT_COOKIE, accepted);
+  }
+
+  /**
+   * Remove the End User Agreement cookie
+   */
+  removeCookieAccepted() {
+    this.cookie.remove(END_USER_AGREEMENT_COOKIE);
+  }
+
+}
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index d83a376da93..641c4ea6a85 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -9,17 +9,13 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { TestScheduler } from 'rxjs/testing';
 import { EPeopleRegistryCancelEPersonAction, EPeopleRegistryEditEPersonAction } from '../../+admin/admin-access-control/epeople-registry/epeople-registry.actions';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestParam } from '../cache/models/request-param.model';
 import { CoreState } from '../core.reducers';
 import { ChangeAnalyzer } from '../data/change-analyzer';
-import { PaginatedList } from '../data/paginated-list';
-import { RemoteData } from '../data/remote-data';
-import { DeleteByIDRequest, FindListOptions, PatchRequest } from '../data/request.models';
-import { RequestEntry } from '../data/request.reducer';
+import { DeleteRequest, FindListOptions, PatchRequest, PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { PageInfo } from '../shared/page-info.model';
 import { EPersonDataService } from './eperson-data.service';
 import { EPerson } from './models/eperson.model';
 import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
@@ -28,6 +24,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
 
 describe('EPersonDataService', () => {
   let service: EPersonDataService;
@@ -43,8 +40,6 @@ describe('EPersonDataService', () => {
   let epeople$;
   let rdbService;
 
-  let getRequestEntry$;
-
   function initTestService() {
     return new EPersonDataService(
       requestService,
@@ -59,16 +54,10 @@ describe('EPersonDataService', () => {
   }
 
   function init() {
-    getRequestEntry$ = (successful: boolean) => {
-      return observableOf({
-        completed: true,
-        response: { isSuccessful: successful, payload: epeople } as any
-      } as RequestEntry)
-    };
     restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
     epersonsEndpoint = `${restEndpointURL}/epersons`;
     epeople = [EPersonMock, EPersonMock2];
-    epeople$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [epeople]));
+    epeople$ = createSuccessfulRemoteDataObject$(createPaginatedList([epeople]));
     rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/epersons': epeople$ });
     halService = new HALEndpointServiceStub(restEndpointURL);
 
@@ -91,7 +80,7 @@ describe('EPersonDataService', () => {
 
   beforeEach(() => {
     init();
-    requestService = getMockRequestService(getRequestEntry$(true));
+    requestService = getMockRequestService(createRequestEntry$(epeople));
     store = new Store<CoreState>(undefined, undefined, undefined);
     service = initTestService();
     spyOn(store, 'dispatch');
@@ -105,33 +94,33 @@ describe('EPersonDataService', () => {
     it('search by default scope (byMetadata) and no query', () => {
       service.searchByScope(null, '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new SearchParam('query', ''))]
+        searchParams: [Object.assign(new RequestParam('query', ''))]
       });
-      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options);
+      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true);
     });
 
     it('search metadata scope and no query', () => {
       service.searchByScope('metadata', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new SearchParam('query', ''))]
+        searchParams: [Object.assign(new RequestParam('query', ''))]
       });
-      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options);
+      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true);
     });
 
     it('search metadata scope and with query', () => {
       service.searchByScope('metadata', 'test');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new SearchParam('query', 'test'))]
+        searchParams: [Object.assign(new RequestParam('query', 'test'))]
       });
-      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options);
+      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true);
     });
 
     it('search email scope and no query', () => {
       service.searchByScope('email', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new SearchParam('email', ''))]
+        searchParams: [Object.assign(new RequestParam('email', ''))]
       });
-      expect(service.searchBy).toHaveBeenCalledWith('byEmail', options);
+      expect(service.searchBy).toHaveBeenCalledWith('byEmail', options, true);
     });
   });
 
@@ -281,21 +270,36 @@ describe('EPersonDataService', () => {
 
   describe('deleteEPerson', () => {
     beforeEach(() => {
-      spyOn(service, 'findById').and.returnValue(getRemotedataObservable(EPersonMock));
+      spyOn(service, 'findById').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock));
       service.deleteEPerson(EPersonMock).subscribe();
     });
 
     it('should send DeleteRequest', () => {
-      const expected = new DeleteByIDRequest(requestService.generateRequestId(), epersonsEndpoint + '/' + EPersonMock.uuid, EPersonMock.uuid);
+      const expected = new DeleteRequest(requestService.generateRequestId(), epersonsEndpoint + '/' + EPersonMock.uuid);
       expect(requestService.configure).toHaveBeenCalledWith(expected);
     });
   });
 
-});
+  describe('createEPersonForToken', () => {
+    it('should sent a postRquest with an eperson to the token endpoint', () => {
+      service.createEPersonForToken(EPersonMock, 'test-token');
 
-function getRemotedataObservable(obj: any): Observable<RemoteData<any>> {
-  return observableOf(new RemoteData(false, false, true, undefined, obj));
-}
+      const expected = new PostRequest(requestService.generateRequestId(), epersonsEndpoint + '?token=test-token', EPersonMock);
+      expect(requestService.configure).toHaveBeenCalledWith(expected);
+    });
+  });
+  describe('patchPasswordWithToken', () => {
+    it('should sent a patch request with an uuid, token and new password to the epersons endpoint', () => {
+      service.patchPasswordWithToken('test-uuid', 'test-token','test-password');
+
+      const operation = Object.assign({ op: 'add', path: '/password', value: 'test-password' });
+      const expected = new PatchRequest(requestService.generateRequestId(), epersonsEndpoint + '/test-uuid?token=test-token', [operation]);
+
+      expect(requestService.configure).toHaveBeenCalledWith(expected);
+    });
+  });
+
+});
 
 class DummyChangeAnalyzer implements ChangeAnalyzer<Item> {
   diff(object1: Item, object2: Item): Operation[] {
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index a8cee6f1de9..6728a1c8208 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { createSelector, select, Store } from '@ngrx/store';
 import { Operation } from 'fast-json-patch/lib/core';
 import { Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import { filter, find, map, take } from 'rxjs/operators';
 import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction
@@ -15,19 +15,24 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { RestResponse } from '../cache/response.models';
 import { DataService } from '../data/data.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { FindListOptions, FindListRequest, PatchRequest, } from '../data/request.models';
+import {
+  FindListOptions,
+  FindListRequest,
+  PatchRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData, } from '../shared/operators';
 import { EPerson } from './models/eperson.model';
 import { EPERSON } from './models/eperson.resource-type';
+import { NoContent } from '../shared/NoContent.model';
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
 const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
@@ -92,34 +97,43 @@ export class EPersonDataService extends DataService<EPerson> {
 
   /**
    * Returns a search result list of EPeople, by email query (/eperson/epersons/search/{@link searchByEmailPath}?email=<>)
-   * @param query     email query
+   * @param query             email query
    * @param options
-   * @param linksToFollow
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  private getEpeopleByEmail(query: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<EPerson>>): Observable<RemoteData<PaginatedList<EPerson>>> {
-    const searchParams = [new SearchParam('email', query)];
-    return this.getEPeopleBy(searchParams, this.searchByEmailPath, options, ...linksToFollow);
+  private getEpeopleByEmail(query: string, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<EPerson>>): Observable<RemoteData<PaginatedList<EPerson>>> {
+    const searchParams = [new RequestParam('email', query)];
+    return this.getEPeopleBy(searchParams, this.searchByEmailPath, options, reRequestOnStale, ...linksToFollow);
   }
 
   /**
    * Returns a search result list of EPeople, by metadata query (/eperson/epersons/search/{@link searchByMetadataPath}?query=<>)
    * @param query     metadata query
    * @param options
-   * @param linksToFollow
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  private getEpeopleByMetadata(query: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<EPerson>>): Observable<RemoteData<PaginatedList<EPerson>>> {
-    const searchParams = [new SearchParam('query', query)];
-    return this.getEPeopleBy(searchParams, this.searchByMetadataPath, options, ...linksToFollow);
+  private getEpeopleByMetadata(query: string, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<EPerson>>): Observable<RemoteData<PaginatedList<EPerson>>> {
+    const searchParams = [new RequestParam('query', query)];
+    return this.getEPeopleBy(searchParams, this.searchByMetadataPath, options, reRequestOnStale, ...linksToFollow);
   }
 
   /**
    * Returns a search result list of EPeople in a given searchMethod, with given searchParams
-   * @param searchParams    query parameters in the search
-   * @param searchMethod    searchBy path
+   * @param searchParams      query parameters in the search
+   * @param searchMethod      searchBy path
    * @param options
-   * @param linksToFollow
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  private getEPeopleBy(searchParams: SearchParam[], searchMethod: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<EPerson>>): Observable<RemoteData<PaginatedList<EPerson>>> {
+  private getEPeopleBy(searchParams: RequestParam[], searchMethod: string, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<EPerson>>): Observable<RemoteData<PaginatedList<EPerson>>> {
     let findListOptions = new FindListOptions();
     if (options) {
       findListOptions = Object.assign(new FindListOptions(), options);
@@ -129,7 +143,7 @@ export class EPersonDataService extends DataService<EPerson> {
     } else {
       findListOptions.searchParams = searchParams;
     }
-    return this.searchBy(searchMethod, findListOptions, ...linksToFollow);
+    return this.searchBy(searchMethod, findListOptions, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -137,11 +151,11 @@ export class EPersonDataService extends DataService<EPerson> {
    * The patch is derived from the differences between the given object and its version in the object cache
    * @param {DSpaceObject} ePerson The given object
    */
-  public updateEPerson(ePerson: EPerson): Observable<RestResponse> {
+  public updateEPerson(ePerson: EPerson): Observable<RemoteData<EPerson>> {
     const requestId = this.requestService.generateRequestId();
     const oldVersion$ = this.findByHref(ePerson._links.self.href);
     oldVersion$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       map((oldEPerson: EPerson) => {
         const operations = this.generateOperations(oldEPerson, ePerson);
@@ -151,7 +165,7 @@ export class EPersonDataService extends DataService<EPerson> {
       take(1)
     ).subscribe();
 
-    return this.fetchResponse(requestId);
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -165,17 +179,17 @@ export class EPersonDataService extends DataService<EPerson> {
     if (hasValue(oldEPerson.email) && oldEPerson.email !== newEPerson.email) {
       operations = [...operations, {
         op: 'replace', path: '/email', value: newEPerson.email
-      }]
+      }];
     }
     if (hasValue(oldEPerson.requireCertificate) && oldEPerson.requireCertificate !== newEPerson.requireCertificate) {
       operations = [...operations, {
         op: 'replace', path: '/certificate', value: newEPerson.requireCertificate
-      }]
+      }];
     }
     if (hasValue(oldEPerson.canLogIn) && oldEPerson.canLogIn !== newEPerson.canLogIn) {
       operations = [...operations, {
         op: 'replace', path: '/canLogIn', value: newEPerson.canLogIn
-      }]
+      }];
     }
     return operations;
   }
@@ -200,7 +214,7 @@ export class EPersonDataService extends DataService<EPerson> {
    * Method to retrieve the eperson that is currently being edited
    */
   public getActiveEPerson(): Observable<EPerson> {
-    return this.store.pipe(select(editEPersonSelector))
+    return this.store.pipe(select(editEPersonSelector));
   }
 
   /**
@@ -222,7 +236,7 @@ export class EPersonDataService extends DataService<EPerson> {
    * Method to delete an EPerson
    * @param ePerson The EPerson to delete
    */
-  public deleteEPerson(ePerson: EPerson): Observable<boolean> {
+  public deleteEPerson(ePerson: EPerson): Observable<RemoteData<NoContent>> {
     return this.delete(ePerson.id);
   }
 
@@ -249,4 +263,51 @@ export class EPersonDataService extends DataService<EPerson> {
     return '/admin/access-control/epeople';
   }
 
+  /**
+   * Create a new EPerson using a token
+   * @param eperson
+   * @param token
+   */
+  public createEPersonForToken(eperson: EPerson, token: string): Observable<RemoteData<EPerson>> {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getBrowseEndpoint().pipe(
+      map((href: string) => `${href}?token=${token}`));
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PostRequest(requestId, href, eperson);
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+
+  }
+
+  /**
+   * Sends a patch request to update an epersons password based on a forgot password token
+   * @param uuid      Uuid of the eperson
+   * @param token     The forgot password token
+   * @param password  The new password value
+   */
+  patchPasswordWithToken(uuid: string, token: string, password: string): Observable<RemoteData<EPerson>> {
+    const requestId = this.requestService.generateRequestId();
+
+    const operation = Object.assign({ op: 'add', path: '/password', value: password });
+
+    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
+      map((endpoint: string) => this.getIDHref(endpoint, uuid)),
+      map((href: string) => `${href}?token=${token}`));
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PatchRequest(requestId, href, [operation]);
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
+
 }
diff --git a/src/app/core/eperson/eperson-response-parsing.service.ts b/src/app/core/eperson/eperson-response-parsing.service.ts
deleted file mode 100644
index e1270e130e6..00000000000
--- a/src/app/core/eperson/eperson-response-parsing.service.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { RestRequest } from '../data/request.models';
-import { ResponseParsingService } from '../data/parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { EpersonSuccessResponse, ErrorResponse, RestResponse } from '../cache/response.models';
-import { isNotEmpty } from '../../shared/empty.util';
-import { BaseResponseParsingService } from '../data/base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
-
-/**
- * Provides method to parse response from eperson endpoint.
- */
-@Injectable()
-export class EpersonResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-
-  protected toCache = false;
-
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) {
-    super();
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links)) {
-      const epersonDefinition = this.process<DSpaceObject>(data.payload, request);
-      return new EpersonSuccessResponse(epersonDefinition[Object.keys(epersonDefinition)[0]], data.statusCode, data.statusText, this.processPageInfo(data.payload));
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from EPerson endpoint'),
-          {statusCode: data.statusCode, statusText: data.statusText}
-        )
-      );
-    }
-  }
-
-}
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index 28d10cfcf18..71248d37ba1 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -3,7 +3,6 @@ import { HttpHeaders } from '@angular/common/http';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
-import { of as observableOf } from 'rxjs';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { compare, Operation } from 'fast-json-patch';
 import {
@@ -11,16 +10,13 @@ import {
   GroupRegistryEditGroupAction
 } from '../../+admin/admin-access-control/group-registry/group-registry.actions';
 import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestParam } from '../cache/models/request-param.model';
 import { CoreState } from '../core.reducers';
 import { ChangeAnalyzer } from '../data/change-analyzer';
-import { PaginatedList } from '../data/paginated-list';
-import { DeleteByIDRequest, DeleteRequest, FindListOptions, PostRequest } from '../data/request.models';
-import { RequestEntry } from '../data/request.reducer';
+import { DeleteRequest, FindListOptions, PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Item } from '../shared/item.model';
-import { PageInfo } from '../shared/page-info.model';
 import { GroupDataService } from './group-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
@@ -28,6 +24,7 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic
 import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
+import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
 
 describe('GroupDataService', () => {
   let service: GroupDataService;
@@ -41,19 +38,11 @@ describe('GroupDataService', () => {
   let halService;
   let rdbService;
 
-  let getRequestEntry$;
-
   function init() {
-    getRequestEntry$ = (successful: boolean) => {
-      return observableOf({
-        completed: true,
-        response: { isSuccessful: successful, payload: groups } as any
-      } as RequestEntry)
-    };
     restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
     groupsEndpoint = `${restEndpointURL}/groups`;
     groups = [GroupMock, GroupMock2];
-    groups$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), groups));
+    groups$ = createSuccessfulRemoteDataObject$(createPaginatedList(groups));
     rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups': groups$ });
     halService = new HALEndpointServiceStub(restEndpointURL);
     TestBed.configureTestingModule({
@@ -89,7 +78,7 @@ describe('GroupDataService', () => {
 
   beforeEach(() => {
     init();
-    requestService = getMockRequestService(getRequestEntry$(true));
+    requestService = getMockRequestService(createRequestEntry$(groups));
     store = new Store<CoreState>(undefined, undefined, undefined);
     service = initTestService();
     spyOn(store, 'dispatch');
@@ -103,28 +92,17 @@ describe('GroupDataService', () => {
     it('search with empty query', () => {
       service.searchGroups('');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new SearchParam('query', ''))]
+        searchParams: [Object.assign(new RequestParam('query', ''))]
       });
-      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options);
+      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true);
     });
 
     it('search with query', () => {
       service.searchGroups('test');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new SearchParam('query', 'test'))]
+        searchParams: [Object.assign(new RequestParam('query', 'test'))]
       });
-      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options);
-    });
-  });
-
-  describe('deleteGroup', () => {
-    beforeEach(() => {
-      service.deleteGroup(GroupMock2).subscribe();
-    });
-
-    it('should send DeleteRequest', () => {
-      const expected = new DeleteByIDRequest(requestService.generateRequestId(), groupsEndpoint + '/' + GroupMock2.uuid, GroupMock2.uuid);
-      expect(requestService.configure).toHaveBeenCalledWith(expected);
+      expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true);
     });
   });
 
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 574b4d997a2..311e5eed3af 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 
 import { createSelector, select, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { filter, map, take } from 'rxjs/operators';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
@@ -14,12 +14,11 @@ import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { RestResponse } from '../cache/response.models';
 import { DataService } from '../data/data.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import {
   CreateRequest,
@@ -30,9 +29,9 @@ import {
 } from '../data/request.models';
 
 import { RequestService } from '../data/request.service';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { configureRequest, getResponseFromEntry} from '../shared/operators';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { EPerson } from './models/eperson.model';
 import { Group } from './models/group.model';
 import { dataService } from '../cache/builders/build-decorators';
@@ -40,7 +39,7 @@ import { GROUP } from './models/group.resource-type';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { Community } from '../shared/community.model';
 import { Collection } from '../shared/collection.model';
-import { ComcolRole } from '../../shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role';
+import { NoContent } from '../shared/NoContent.model';
 
 const groupRegistryStateSelector = (state: AppState) => state.groupRegistry;
 const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegistryState: GroupRegistryState) => groupRegistryState.editGroup);
@@ -92,12 +91,15 @@ export class GroupDataService extends DataService<Group> {
   /**
    * Returns a search result list of groups, with certain query (searches in group name and by exact uuid)
    * Endpoint used: /eperson/groups/search/byMetadata?query=<:name>
-   * @param query     search query param
+   * @param query             search query param
    * @param options
-   * @param linksToFollow
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    */
-  public searchGroups(query: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<Group>>): Observable<RemoteData<PaginatedList<Group>>> {
-    const searchParams = [new SearchParam('query', query)];
+  public searchGroups(query: string, options?: FindListOptions, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Group>>): Observable<RemoteData<PaginatedList<Group>>> {
+    const searchParams = [new RequestParam('query', query)];
     let findListOptions = new FindListOptions();
     if (options) {
       findListOptions = Object.assign(new FindListOptions(), options);
@@ -107,7 +109,7 @@ export class GroupDataService extends DataService<Group> {
     } else {
       findListOptions.searchParams = searchParams;
     }
-    return this.searchBy('byMetadata', findListOptions, ...linksToFollow);
+    return this.searchBy('byMetadata', findListOptions, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -121,7 +123,7 @@ export class GroupDataService extends DataService<Group> {
   isMemberOf(groupName: string): Observable<boolean> {
     const searchHref = 'isMemberOf';
     const options = new FindListOptions();
-    options.searchParams = [new SearchParam('groupName', groupName)];
+    options.searchParams = [new RequestParam('groupName', groupName)];
 
     return this.searchBy(searchHref, options).pipe(
       filter((groups: RemoteData<PaginatedList<Group>>) => !groups.isResponsePending),
@@ -130,43 +132,12 @@ export class GroupDataService extends DataService<Group> {
     );
   }
 
-  /**
-   * Method to delete a group
-   * @param id The group id to delete
-   */
-  public deleteGroup(group: Group): Observable<boolean> {
-    return this.delete(group.id);
-  }
-
-  /**
-   * Create or Update a group
-   *  If the group contains an id, it is assumed the eperson already exists and is updated instead
-   * @param group    The group to create or update
-   */
-  public createOrUpdateGroup(group: Group): Observable<RemoteData<Group>> {
-    const isUpdate = hasValue(group.id);
-    if (isUpdate) {
-      return this.updateGroup(group);
-    } else {
-      return this.create(group, null);
-    }
-  }
-
-  /**
-   * // TODO
-   * @param {DSpaceObject} ePerson The given object
-   */
-  updateGroup(group: Group): Observable<RemoteData<Group>> {
-    // TODO
-    return null;
-  }
-
   /**
    * Adds given subgroup as a subgroup to the given active group
    * @param activeGroup   Group we want to add subgroup to
    * @param subgroup      Group we want to add as subgroup to activeGroup
    */
-  addSubGroupToGroup(activeGroup: Group, subgroup: Group): Observable<RestResponse> {
+  addSubGroupToGroup(activeGroup: Group, subgroup: Group): Observable<RemoteData<Group>> {
     const requestId = this.requestService.generateRequestId();
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
@@ -175,7 +146,7 @@ export class GroupDataService extends DataService<Group> {
     const postRequest = new PostRequest(requestId, activeGroup.self + '/' + this.subgroupsEndpoint, subgroup.self, options);
     this.requestService.configure(postRequest);
 
-    return this.fetchResponse(requestId);
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -183,12 +154,12 @@ export class GroupDataService extends DataService<Group> {
    * @param activeGroup   Group we want to delete subgroup from
    * @param subgroup      Subgroup we want to delete from activeGroup
    */
-  deleteSubGroupFromGroup(activeGroup: Group, subgroup: Group): Observable<RestResponse> {
+  deleteSubGroupFromGroup(activeGroup: Group, subgroup: Group): Observable<RemoteData<Group>> {
     const requestId = this.requestService.generateRequestId();
     const deleteRequest = new DeleteRequest(requestId, activeGroup.self + '/' + this.subgroupsEndpoint + '/' + subgroup.id);
     this.requestService.configure(deleteRequest);
 
-    return this.fetchResponse(requestId);
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -196,7 +167,7 @@ export class GroupDataService extends DataService<Group> {
    * @param activeGroup   Group we want to add member to
    * @param ePerson       EPerson we want to add as member to given activeGroup
    */
-  addMemberToGroup(activeGroup: Group, ePerson: EPerson): Observable<RestResponse> {
+  addMemberToGroup(activeGroup: Group, ePerson: EPerson): Observable<RemoteData<Group>> {
     const requestId = this.requestService.generateRequestId();
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
@@ -205,7 +176,7 @@ export class GroupDataService extends DataService<Group> {
     const postRequest = new PostRequest(requestId, activeGroup.self + '/' + this.ePersonsEndpoint, ePerson.self, options);
     this.requestService.configure(postRequest);
 
-    return this.fetchResponse(requestId);
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -213,25 +184,12 @@ export class GroupDataService extends DataService<Group> {
    * @param activeGroup   Group we want to delete member from
    * @param ePerson       EPerson we want to delete from members of given activeGroup
    */
-  deleteMemberFromGroup(activeGroup: Group, ePerson: EPerson): Observable<RestResponse> {
+  deleteMemberFromGroup(activeGroup: Group, ePerson: EPerson): Observable<RemoteData<Group>> {
     const requestId = this.requestService.generateRequestId();
     const deleteRequest = new DeleteRequest(requestId, activeGroup.self + '/' + this.ePersonsEndpoint + '/' + ePerson.id);
     this.requestService.configure(deleteRequest);
 
-    return this.fetchResponse(requestId);
-  }
-
-  /**
-   * Gets the restResponse from the requestService
-   * @param requestId
-   */
-  protected fetchResponse(requestId: string): Observable<RestResponse> {
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        return response;
-      })
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 
   /**
@@ -324,16 +282,17 @@ export class GroupDataService extends DataService<Group> {
    * Create a group for a given role for a given community or collection.
    *
    * @param dso         The community or collection for which to create a group
+   * @param role        The name of the role for which to create a group
    * @param link        The REST endpoint to create the group
    */
-  createComcolGroup(dso: Community|Collection, link: string): Observable<RestResponse> {
+  createComcolGroup(dso: Community|Collection, role: string, link: string): Observable<RemoteData<Group>> {
 
     const requestId = this.requestService.generateRequestId();
     const group = Object.assign(new Group(), {
       metadata: {
         'dc.description': [
           {
-            value: `${this.nameService.getName(dso)} admin group`,
+            value: `${this.nameService.getName(dso)} ${role} group`,
           }
         ],
       },
@@ -346,10 +305,17 @@ export class GroupDataService extends DataService<Group> {
         JSON.stringify(group),
       ));
 
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      tap(() => this.requestService.removeByHrefSubstring(link)),
+    const responseRD$ = this.rdbService.buildFromRequestUUID<Group>(requestId).pipe(
+      getFirstCompletedRemoteData(),
     );
+
+    responseRD$.subscribe((responseRD: RemoteData<Group>) => {
+      if (responseRD.hasSucceeded) {
+        this.requestService.removeByHrefSubstring(link);
+      }
+    });
+
+    return responseRD$;
   }
 
   /**
@@ -357,7 +323,7 @@ export class GroupDataService extends DataService<Group> {
    *
    * @param link        The REST endpoint to delete the group
    */
-  deleteComcolGroup(link: string): Observable<RestResponse> {
+  deleteComcolGroup(link: string): Observable<RemoteData<NoContent>> {
 
     const requestId = this.requestService.generateRequestId();
 
@@ -367,9 +333,16 @@ export class GroupDataService extends DataService<Group> {
         link,
       ));
 
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      tap(() => this.requestService.removeByHrefSubstring(link)),
+    const responseRD$ = this.rdbService.buildFromRequestUUID(requestId).pipe(
+      getFirstCompletedRemoteData(),
     );
+
+    responseRD$.subscribe((responseRD: RemoteData<NoContent>) => {
+      if (responseRD.hasSucceeded) {
+        this.requestService.removeByHrefSubstring(link);
+      }
+    });
+
+    return responseRD$;
   }
 }
diff --git a/src/app/core/eperson/models/eperson-dto.model.ts b/src/app/core/eperson/models/eperson-dto.model.ts
new file mode 100644
index 00000000000..f491f6f8bea
--- /dev/null
+++ b/src/app/core/eperson/models/eperson-dto.model.ts
@@ -0,0 +1,17 @@
+import { EPerson } from './eperson.model';
+
+/**
+ * This class serves as a Data Transfer Model that contains the EPerson and whether or not it's able to be deleted
+ */
+export class EpersonDtoModel {
+
+    /**
+     * The EPerson linked to this object
+     */
+    public eperson: EPerson;
+    /**
+     * Whether or not the linked EPerson is able to be deleted
+     */
+    public ableToDelete: boolean;
+
+}
diff --git a/src/app/core/eperson/models/eperson.model.ts b/src/app/core/eperson/models/eperson.model.ts
index bb990221121..688b1ef6d46 100644
--- a/src/app/core/eperson/models/eperson.model.ts
+++ b/src/app/core/eperson/models/eperson.model.ts
@@ -1,7 +1,7 @@
 import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { Observable } from 'rxjs';
 import { link, typedObject } from '../../cache/builders/build-decorators';
-import { PaginatedList } from '../../data/paginated-list';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
 
 import { DSpaceObject } from '../../shared/dspace-object.model';
@@ -57,6 +57,12 @@ export class EPerson extends DSpaceObject {
   @autoserialize
   public selfRegistered: boolean;
 
+  /**
+   * The password of this EPerson
+   */
+  @autoserialize
+  public password: string;
+
   /**
    * Getter to retrieve the EPerson's full name as a string
    */
diff --git a/src/app/core/eperson/models/group-dto.model.ts b/src/app/core/eperson/models/group-dto.model.ts
new file mode 100644
index 00000000000..db167dc6b29
--- /dev/null
+++ b/src/app/core/eperson/models/group-dto.model.ts
@@ -0,0 +1,17 @@
+import { Group } from './group.model';
+
+/**
+ * This class serves as a Data Transfer Model that contains the Group and whether or not it's able to be deleted
+ */
+export class GroupDtoModel {
+
+  /**
+   * The Group linked to this object
+   */
+  public group: Group;
+  /**
+   * Whether or not the linked Group is able to be deleted
+   */
+  public ableToDelete: boolean;
+
+}
diff --git a/src/app/core/eperson/models/group.model.ts b/src/app/core/eperson/models/group.model.ts
index e496babddc7..125914e0566 100644
--- a/src/app/core/eperson/models/group.model.ts
+++ b/src/app/core/eperson/models/group.model.ts
@@ -1,10 +1,11 @@
 import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { Observable } from 'rxjs';
 import { link, typedObject } from '../../cache/builders/build-decorators';
-import { PaginatedList } from '../../data/paginated-list';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
 
 import { DSpaceObject } from '../../shared/dspace-object.model';
+import { DSPACE_OBJECT } from '../../shared/dspace-object.resource-type';
 import { HALLink } from '../../shared/hal-link.model';
 import { EPerson } from './eperson.model';
 import { EPERSON } from './eperson.resource-type';
@@ -41,6 +42,7 @@ export class Group extends DSpaceObject {
     self: HALLink;
     subgroups: HALLink;
     epersons: HALLink;
+    object: HALLink;
   };
 
   /**
@@ -57,4 +59,11 @@ export class Group extends DSpaceObject {
   @link(EPERSON, true)
   public epersons?: Observable<RemoteData<PaginatedList<EPerson>>>;
 
+  /**
+   * Connected dspace object, the community or collection connected to a workflow group (204 no content for non-workflow groups)
+   * Will be undefined unless the object {@link HALLink} has been resolved (can only be resolved for workflow groups)
+   */
+  @link(DSPACE_OBJECT)
+  public object?: Observable<RemoteData<DSpaceObject>>;
+
 }
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
new file mode 100644
index 00000000000..ce70d156391
--- /dev/null
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
@@ -0,0 +1,44 @@
+import { ForwardClientIpInterceptor } from './forward-client-ip.interceptor';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS, HttpRequest } from '@angular/common/http';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+
+describe('ForwardClientIpInterceptor', () => {
+  let service: DspaceRestService;
+  let httpMock: HttpTestingController;
+
+  let requestUrl;
+  let clientIp;
+
+  beforeEach(() => {
+    requestUrl = 'test-url';
+    clientIp = '1.2.3.4';
+
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        DspaceRestService,
+        {
+          provide: HTTP_INTERCEPTORS,
+          useClass: ForwardClientIpInterceptor,
+          multi: true,
+        },
+        { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } }}
+      ],
+    });
+
+    service = TestBed.get(DspaceRestService);
+    httpMock = TestBed.get(HttpTestingController);
+  });
+
+  it('should add an X-Forwarded-For header matching the client\'s IP', () => {
+    service.get(requestUrl).subscribe((response) => {
+      expect(response).toBeTruthy();
+    });
+
+    const httpRequest = httpMock.expectOne(requestUrl);
+    expect(httpRequest.request.headers.get('X-Forwarded-For')).toEqual(clientIp);
+  });
+});
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
new file mode 100644
index 00000000000..2e1be09c960
--- /dev/null
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -0,0 +1,23 @@
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import { Inject, Injectable } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+
+@Injectable()
+/**
+ * Http Interceptor intercepting Http Requests, adding the client's IP to their X-Forwarded-For header
+ */
+export class ForwardClientIpInterceptor implements HttpInterceptor {
+  constructor(@Inject(REQUEST) protected req: any) {
+  }
+
+  /**
+   * Intercept http requests and add the client's IP to the X-Forwarded-For header
+   * @param httpRequest
+   * @param next
+   */
+  intercept(httpRequest: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress;
+    return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } }));
+  }
+}
diff --git a/src/app/core/index/index.actions.ts b/src/app/core/index/index.actions.ts
index d31f6ee2bd4..feff7a44868 100644
--- a/src/app/core/index/index.actions.ts
+++ b/src/app/core/index/index.actions.ts
@@ -46,7 +46,7 @@ export class RemoveFromIndexByValueAction implements Action {
   type = IndexActionTypes.REMOVE_BY_VALUE;
   payload: {
     name: IndexName,
-    value: string
+    value: any
   };
 
   /**
@@ -57,7 +57,7 @@ export class RemoveFromIndexByValueAction implements Action {
    * @param value
    *    the value to remove the UUID for
    */
-  constructor(name: IndexName, value: string) {
+  constructor(name: IndexName, value: any) {
     this.payload = { name, value };
   }
 
diff --git a/src/app/core/index/index.effects.spec.ts b/src/app/core/index/index.effects.spec.ts
new file mode 100644
index 00000000000..5883083e264
--- /dev/null
+++ b/src/app/core/index/index.effects.spec.ts
@@ -0,0 +1,81 @@
+import { Observable } from 'rxjs';
+import { async, TestBed } from '@angular/core/testing';
+import { provideMockActions } from '@ngrx/effects/testing';
+import { UUIDIndexEffects } from './index.effects';
+import { cold, hot } from 'jasmine-marbles';
+import { AddToObjectCacheAction } from '../cache/object-cache.actions';
+import { Item } from '../shared/item.model';
+import { AddToIndexAction } from './index.actions';
+import { IndexName } from './index.reducer';
+
+describe('ObjectUpdatesEffects', () => {
+  let indexEffects: UUIDIndexEffects;
+  let actions: Observable<any>;
+  let objectToCache;
+  let timeCompleted;
+  let msToLive;
+  let requestUUID;
+  let alternativeLink;
+  let selfLink;
+  let otherLink;
+
+  function init() {
+    selfLink = 'rest.org/items/6ca6549c-3db2-4288-8ce4-4a3bce011860';
+    otherLink = 'rest.org/items/51b682e7-7c48-402b-b2b4-ff163f399180';
+    objectToCache = {
+      type: Item.type,
+      uuid: '3601eaed-8fdb-487f-8b89-4d7647314143',
+      _links: {
+        self: { href: selfLink },
+        anotherLink: { href: otherLink }
+      }
+    };
+    timeCompleted = new Date().getDate();
+    msToLive = 90000;
+    requestUUID = '324e5a5c-06f7-428d-b3ba-cc322c5dde39';
+    alternativeLink = 'rest.org/alternative-link/1234';
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      providers: [
+        UUIDIndexEffects,
+        provideMockActions(() => actions),
+      ],
+    });
+  }));
+
+  beforeEach(() => {
+    indexEffects = TestBed.get(UUIDIndexEffects);
+  });
+
+  describe('addAlternativeObjectLink$', () => {
+    let action;
+    it('should emit a new ADD_TO_INDEX action when a AddToObjectCacheAction with alternativeLink is dispatched', () => {
+      action = new AddToObjectCacheAction(objectToCache, timeCompleted, msToLive, requestUUID, alternativeLink);
+      const newAction = new AddToIndexAction(
+        IndexName.ALTERNATIVE_OBJECT_LINK,
+        alternativeLink,
+        objectToCache._links.self.href
+      );
+      actions = hot('--a-', { a: action });
+      const expected = cold('--b-', { b: newAction });
+      expect(indexEffects.addAlternativeObjectLink$).toBeObservable(expected);
+    });
+
+    it('should emit NO_ACTION when a AddToObjectCacheAction without an alternativeLink is dispatched', () => {
+      action = new AddToObjectCacheAction(objectToCache, timeCompleted, msToLive, requestUUID, undefined);
+      actions = hot('--a-', { a: action });
+      const expected = cold('--b-', { b: { type: 'NO_ACTION' } });
+      expect(indexEffects.addAlternativeObjectLink$).toBeObservable(expected);
+    });
+
+    it('should emit NO_ACTION when a AddToObjectCacheAction with an alternativeLink that\'s the same as the objectToCache\'s selfLink is dispatched', () => {
+      action = new AddToObjectCacheAction(objectToCache, timeCompleted, msToLive, requestUUID, objectToCache._links.self.href);
+      actions = hot('--a-', { a: action });
+      const expected = cold('--b-', { b: { type: 'NO_ACTION' } });
+      expect(indexEffects.addAlternativeObjectLink$).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/core/index/index.effects.ts b/src/app/core/index/index.effects.ts
index f885db14365..4406699dcd6 100644
--- a/src/app/core/index/index.effects.ts
+++ b/src/app/core/index/index.effects.ts
@@ -2,11 +2,7 @@ import { filter, map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 
-import {
-  AddToObjectCacheAction,
-  ObjectCacheActionTypes,
-  RemoveFromObjectCacheAction
-} from '../cache/object-cache.actions';
+import { AddToObjectCacheAction, ObjectCacheActionTypes, RemoveFromObjectCacheAction } from '../cache/object-cache.actions';
 import { RequestActionTypes, RequestConfigureAction } from '../data/request.actions';
 import { AddToIndexAction, RemoveFromIndexByValueAction } from './index.actions';
 import { hasValue } from '../../shared/empty.util';
@@ -30,6 +26,28 @@ export class UUIDIndexEffects {
       })
     );
 
+  /**
+   * Adds an alternative link to an object to the ALTERNATIVE_OBJECT_LINK index
+   * When the self link of the objectToCache is not the same as the alternativeLink
+   */
+  @Effect() addAlternativeObjectLink$ = this.actions$
+    .pipe(
+      ofType(ObjectCacheActionTypes.ADD),
+      map((action: AddToObjectCacheAction) => {
+        const alternativeLink = action.payload.alternativeLink;
+        const selfLink = action.payload.objectToCache._links.self.href;
+        if (hasValue(alternativeLink) && alternativeLink !== selfLink) {
+          return new AddToIndexAction(
+            IndexName.ALTERNATIVE_OBJECT_LINK,
+            alternativeLink,
+            selfLink
+          )
+        } else {
+          return { type: 'NO_ACTION' };
+        }
+      })
+    );
+
   @Effect() removeObject$ = this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.REMOVE),
diff --git a/src/app/core/index/index.reducer.spec.ts b/src/app/core/index/index.reducer.spec.ts
index ef46c760c6e..8020b48e8bf 100644
--- a/src/app/core/index/index.reducer.spec.ts
+++ b/src/app/core/index/index.reducer.spec.ts
@@ -20,9 +20,11 @@ describe('requestReducer', () => {
   const testState: MetaIndexState = {
     [IndexName.OBJECT]: {
       [key1]: val1
-    },[IndexName.REQUEST]: {
+    }, [IndexName.ALTERNATIVE_OBJECT_LINK]: {
       [key1]: val1
-    },[IndexName.UUID_MAPPING]: {
+    }, [IndexName.REQUEST]: {
+      [key1]: val1
+    }, [IndexName.UUID_MAPPING]: {
       [key1]: val1
     }
   };
diff --git a/src/app/core/index/index.reducer.ts b/src/app/core/index/index.reducer.ts
index 616363ff7ae..a46d00c0351 100644
--- a/src/app/core/index/index.reducer.ts
+++ b/src/app/core/index/index.reducer.ts
@@ -21,14 +21,21 @@ export enum IndexName {
    * have their responses cached, indexed by the UUIDs of requests that
    * weren't sent because the response they requested was already cached
    */
-  UUID_MAPPING = 'get-request/configured-to-cache-uuid'
+  UUID_MAPPING = 'get-request/configured-to-cache-uuid',
+
+  /**
+   * Contains the alternative link for an objects
+   * Maps these link on to their matching self link in the object cache
+   * Eg. /workspaceitems/12/item --> /items/12345
+   */
+  ALTERNATIVE_OBJECT_LINK = 'object/alt-link-to-self-link'
 }
 
 /**
  * The state of a single index
  */
 export interface IndexState {
-  [key: string]: string
+  [key: string]: any
 }
 
 /**
diff --git a/src/app/core/index/index.selectors.ts b/src/app/core/index/index.selectors.ts
index b23496c501d..a13da2fc7a3 100644
--- a/src/app/core/index/index.selectors.ts
+++ b/src/app/core/index/index.selectors.ts
@@ -71,6 +71,17 @@ export const requestIndexSelector: MemoizedSelector<CoreState, IndexState> = cre
   (state: MetaIndexState) => state[IndexName.REQUEST]
 );
 
+/**
+ * Return the alternative link index based on the MetaIndexState
+ *
+ * @returns
+ *    a MemoizedSelector to select the alternative link index
+ */
+export const alternativeLinkIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
+  metaIndexSelector,
+  (state: MetaIndexState) => state[IndexName.ALTERNATIVE_OBJECT_LINK]
+);
+
 /**
  * Return the request UUID mapping index based on the MetaIndexState
  *
@@ -124,3 +135,17 @@ export const originalRequestUUIDFromRequestUUIDSelector =
     requestUUIDIndexSelector,
     (state: IndexState) => hasValue(state) ? state[uuid] : undefined
   );
+
+/**
+ * Return the self link of an object based on its alternative link
+ *
+ * @param altLink
+ *    the alternative link of an object
+ * @returns
+ *    a MemoizedSelector to select the object self link
+ */
+export const selfLinkFromAlternativeLinkSelector =
+  (altLink: string): MemoizedSelector<CoreState, string> => createSelector(
+    alternativeLinkIndexSelector,
+    (state: IndexState) => hasValue(state) ? state[altLink] : undefined
+  );
diff --git a/src/app/core/integration/authority.service.ts b/src/app/core/integration/authority.service.ts
deleted file mode 100644
index f0a1759be6a..00000000000
--- a/src/app/core/integration/authority.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-
-import { RequestService } from '../data/request.service';
-import { IntegrationService } from './integration.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-
-@Injectable()
-export class AuthorityService extends IntegrationService {
-  protected linkPath = 'authorities';
-  protected entriesEndpoint = 'entries';
-  protected entryValueEndpoint = 'entryValues';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected halService: HALEndpointService) {
-    super();
-  }
-
-}
diff --git a/src/app/core/integration/integration-data.ts b/src/app/core/integration/integration-data.ts
deleted file mode 100644
index b93ce36dad6..00000000000
--- a/src/app/core/integration/integration-data.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { IntegrationModel } from './models/integration.model';
-
-/**
- * A class to represent the data retrieved by an Integration service
- */
-export class IntegrationData {
-  constructor(
-    public pageInfo: PageInfo,
-    public payload: IntegrationModel[]
-  ) { }
-}
diff --git a/src/app/core/integration/integration-response-parsing.service.spec.ts b/src/app/core/integration/integration-response-parsing.service.spec.ts
deleted file mode 100644
index b5cb8c4dc40..00000000000
--- a/src/app/core/integration/integration-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-import { Store } from '@ngrx/store';
-
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { ErrorResponse, IntegrationSuccessResponse } from '../cache/response.models';
-import { CoreState } from '../core.reducers';
-import { PaginatedList } from '../data/paginated-list';
-import { IntegrationRequest } from '../data/request.models';
-import { PageInfo } from '../shared/page-info.model';
-import { IntegrationResponseParsingService } from './integration-response-parsing.service';
-import { AuthorityValue } from './models/authority.value';
-
-describe('IntegrationResponseParsingService', () => {
-  let service: IntegrationResponseParsingService;
-
-  const store = {} as Store<CoreState>;
-  const objectCacheService = new ObjectCacheService(store, undefined);
-  const name = 'type';
-  const metadata = 'dc.type';
-  const query = '';
-  const uuid = 'd9d30c0c-69b7-4369-8397-ca67c888974d';
-  const integrationEndpoint = 'https://rest.api/integration/authorities';
-  const entriesEndpoint = `${integrationEndpoint}/${name}/entries?query=${query}&metadata=${metadata}&uuid=${uuid}`;
-  let validRequest;
-
-  let validResponse;
-
-  let invalidResponse1;
-  let invalidResponse2;
-  let pageInfo;
-  let definitions;
-
-  function initVars() {
-    pageInfo = Object.assign(new PageInfo(), {
-      elementsPerPage: 5,
-      totalElements: 5,
-      totalPages: 1,
-      currentPage: 1,
-      _links: {
-        self: { href: 'https://rest.api/integration/authorities/type/entries' }
-      }
-    });
-    definitions = new PaginatedList(pageInfo, [
-      Object.assign(new AuthorityValue(), {
-        type: 'authority',
-        display: 'One',
-        id: 'One',
-        otherInformation: undefined,
-        value: 'One'
-      }),
-      Object.assign(new AuthorityValue(), {
-        type: 'authority',
-        display: 'Two',
-        id: 'Two',
-        otherInformation: undefined,
-        value: 'Two'
-      }),
-      Object.assign(new AuthorityValue(), {
-        type: 'authority',
-        display: 'Three',
-        id: 'Three',
-        otherInformation: undefined,
-        value: 'Three'
-      }),
-      Object.assign(new AuthorityValue(), {
-        type: 'authority',
-        display: 'Four',
-        id: 'Four',
-        otherInformation: undefined,
-        value: 'Four'
-      }),
-      Object.assign(new AuthorityValue(), {
-        type: 'authority',
-        display: 'Five',
-        id: 'Five',
-        otherInformation: undefined,
-        value: 'Five'
-      })
-    ]);
-    validRequest = new IntegrationRequest('69f375b5-19f4-4453-8c7a-7dc5c55aafbb', entriesEndpoint);
-
-    validResponse = {
-      payload: {
-        page: {
-          number: 0,
-          size: 5,
-          totalElements: 5,
-          totalPages: 1
-        },
-        _embedded: {
-          authorityEntries: [
-            {
-              display: 'One',
-              id: 'One',
-              otherInformation: {},
-              type: 'authority',
-              value: 'One'
-            },
-            {
-              display: 'Two',
-              id: 'Two',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Two'
-            },
-            {
-              display: 'Three',
-              id: 'Three',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Three'
-            },
-            {
-              display: 'Four',
-              id: 'Four',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Four'
-            },
-            {
-              display: 'Five',
-              id: 'Five',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Five'
-            },
-          ],
-
-        },
-        _links: {
-          self: { href: 'https://rest.api/integration/authorities/type/entries' }
-        }
-      },
-      statusCode: 200,
-      statusText: 'OK'
-    };
-
-    invalidResponse1 = {
-      payload: {},
-      statusCode: 400,
-      statusText: 'Bad Request'
-    };
-
-    invalidResponse2 = {
-      payload: {
-        page: {
-          number: 0,
-          size: 5,
-          totalElements: 5,
-          totalPages: 1
-        },
-        _embedded: {
-          authorityEntries: [
-            {
-              display: 'One',
-              id: 'One',
-              otherInformation: {},
-              type: 'authority',
-              value: 'One'
-            },
-            {
-              display: 'Two',
-              id: 'Two',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Two'
-            },
-            {
-              display: 'Three',
-              id: 'Three',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Three'
-            },
-            {
-              display: 'Four',
-              id: 'Four',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Four'
-            },
-            {
-              display: 'Five',
-              id: 'Five',
-              otherInformation: {},
-              type: 'authority',
-              value: 'Five'
-            },
-          ],
-
-        },
-        _links: {}
-      },
-      statusCode: 500,
-      statusText: 'Internal Server Error'
-    };
-  }
-  beforeEach(() => {
-    initVars();
-    service = new IntegrationResponseParsingService(objectCacheService);
-  });
-
-  describe('parse', () => {
-    it('should return a IntegrationSuccessResponse if data contains a valid endpoint response', () => {
-      const response = service.parse(validRequest, validResponse);
-      expect(response.constructor).toBe(IntegrationSuccessResponse);
-    });
-
-    it('should return an ErrorResponse if data contains an invalid config endpoint response', () => {
-      const response1 = service.parse(validRequest, invalidResponse1);
-      const response2 = service.parse(validRequest, invalidResponse2);
-      expect(response1.constructor).toBe(ErrorResponse);
-      expect(response2.constructor).toBe(ErrorResponse);
-    });
-
-    it('should return a IntegrationSuccessResponse with data definition', () => {
-      const response = service.parse(validRequest, validResponse);
-      expect((response as any).dataDefinition).toEqual(definitions);
-    });
-
-  });
-});
diff --git a/src/app/core/integration/integration-response-parsing.service.ts b/src/app/core/integration/integration-response-parsing.service.ts
deleted file mode 100644
index 2719669baed..00000000000
--- a/src/app/core/integration/integration-response-parsing.service.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Inject, Injectable } from '@angular/core';
-import { RestRequest } from '../data/request.models';
-import { ResponseParsingService } from '../data/parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { ErrorResponse, IntegrationSuccessResponse, RestResponse } from '../cache/response.models';
-import { isNotEmpty } from '../../shared/empty.util';
-
-import { BaseResponseParsingService } from '../data/base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { IntegrationModel } from './models/integration.model';
-import { AuthorityValue } from './models/authority.value';
-import { PaginatedList } from '../data/paginated-list';
-
-@Injectable()
-export class IntegrationResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
-
-  protected toCache = true;
-
-  constructor(
-    protected objectCache: ObjectCacheService,
-  ) {
-    super();
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links)) {
-      const dataDefinition = this.process<IntegrationModel>(data.payload, request);
-      return new IntegrationSuccessResponse(this.processResponse(dataDefinition), data.statusCode, data.statusText, this.processPageInfo(data.payload));
-    } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from Integration endpoint'),
-          {statusCode: data.statusCode, statusText: data.statusText}
-        )
-      );
-    }
-  }
-
-  protected processResponse(data: PaginatedList<IntegrationModel>): any {
-    const returnList = Array.of();
-    data.page.forEach((item, index) => {
-      if (item.type === AuthorityValue.type.value) {
-        data.page[index] = Object.assign(new AuthorityValue(), item);
-      }
-    });
-
-    return data;
-  }
-
-}
diff --git a/src/app/core/integration/integration.service.spec.ts b/src/app/core/integration/integration.service.spec.ts
deleted file mode 100644
index 148a5df7b82..00000000000
--- a/src/app/core/integration/integration.service.spec.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-
-import { RequestService } from '../data/request.service';
-import { IntegrationRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { IntegrationService } from './integration.service';
-import { IntegrationSearchOptions } from './models/integration-options.model';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-
-const LINK_NAME = 'authorities';
-const ENTRIES = 'entries';
-const ENTRY_VALUE = 'entryValue';
-
-class TestService extends IntegrationService {
-  protected linkPath = LINK_NAME;
-  protected entriesEndpoint = ENTRIES;
-  protected entryValueEndpoint = ENTRY_VALUE;
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected halService: HALEndpointService) {
-    super();
-  }
-}
-
-describe('IntegrationService', () => {
-  let scheduler: TestScheduler;
-  let service: TestService;
-  let requestService: RequestService;
-  let rdbService: RemoteDataBuildService;
-  let halService: any;
-  let findOptions: IntegrationSearchOptions;
-
-  const name = 'type';
-  const metadata = 'dc.type';
-  const query = '';
-  const value = 'test';
-  const uuid = 'd9d30c0c-69b7-4369-8397-ca67c888974d';
-  const integrationEndpoint = 'https://rest.api/integration';
-  const serviceEndpoint = `${integrationEndpoint}/${LINK_NAME}`;
-  const entriesEndpoint = `${serviceEndpoint}/${name}/entries?query=${query}&metadata=${metadata}&uuid=${uuid}`;
-  const entryValueEndpoint = `${serviceEndpoint}/${name}/entryValue/${value}?metadata=${metadata}`;
-
-  findOptions = new IntegrationSearchOptions(uuid, name, metadata);
-
-  function initTestService(): TestService {
-    return new TestService(
-      requestService,
-      rdbService,
-      halService
-    );
-  }
-
-  beforeEach(() => {
-    requestService = getMockRequestService();
-    rdbService = getMockRemoteDataBuildService();
-    scheduler = getTestScheduler();
-    halService = new HALEndpointServiceStub(integrationEndpoint);
-    findOptions = new IntegrationSearchOptions(uuid, name, metadata, query);
-    service = initTestService();
-
-  });
-
-  describe('getEntriesByName', () => {
-
-    it('should configure a new IntegrationRequest', () => {
-      const expected = new IntegrationRequest(requestService.generateRequestId(), entriesEndpoint);
-      scheduler.schedule(() => service.getEntriesByName(findOptions).subscribe());
-      scheduler.flush();
-
-      expect(requestService.configure).toHaveBeenCalledWith(expected);
-    });
-  });
-
-  describe('getEntryByValue', () => {
-
-    it('should configure a new IntegrationRequest', () => {
-      findOptions = new IntegrationSearchOptions(
-        null,
-        name,
-        metadata,
-        value);
-
-      const expected = new IntegrationRequest(requestService.generateRequestId(), entryValueEndpoint);
-      scheduler.schedule(() => service.getEntryByValue(findOptions).subscribe());
-      scheduler.flush();
-
-      expect(requestService.configure).toHaveBeenCalledWith(expected);
-    });
-  });
-});
diff --git a/src/app/core/integration/integration.service.ts b/src/app/core/integration/integration.service.ts
deleted file mode 100644
index 5826f4646dd..00000000000
--- a/src/app/core/integration/integration.service.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
-import { RequestService } from '../data/request.service';
-import { IntegrationSuccessResponse } from '../cache/response.models';
-import { GetRequest, IntegrationRequest } from '../data/request.models';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { IntegrationData } from './integration-data';
-import { IntegrationSearchOptions } from './models/integration-options.model';
-import { getResponseFromEntry } from '../shared/operators';
-
-export abstract class IntegrationService {
-  protected request: IntegrationRequest;
-  protected abstract requestService: RequestService;
-  protected abstract linkPath: string;
-  protected abstract entriesEndpoint: string;
-  protected abstract entryValueEndpoint: string;
-  protected abstract halService: HALEndpointService;
-
-  protected getData(request: GetRequest): Observable<IntegrationData> {
-     return this.requestService.getByHref(request.href).pipe(
-       getResponseFromEntry(),
-       mergeMap((response: IntegrationSuccessResponse) => {
-          if (response.isSuccessful && isNotEmpty(response)) {
-            return observableOf(new IntegrationData(
-              response.pageInfo,
-              (response.dataDefinition) ? response.dataDefinition.page : []
-            ));
-          } else if (!response.isSuccessful) {
-            return observableThrowError(new Error(`Couldn't retrieve the integration data`));
-          }
-        }),
-       distinctUntilChanged()
-      );
-  }
-
-  protected getEntriesHref(endpoint, options: IntegrationSearchOptions = new IntegrationSearchOptions()): string {
-    let result;
-    const args = [];
-
-    if (hasValue(options.name)) {
-      result = `${endpoint}/${options.name}/${this.entriesEndpoint}`;
-    } else {
-      result = endpoint;
-    }
-
-    if (hasValue(options.query)) {
-      args.push(`query=${options.query}`);
-    }
-
-    if (hasValue(options.metadata)) {
-      args.push(`metadata=${options.metadata}`);
-    }
-
-    if (hasValue(options.uuid)) {
-      args.push(`uuid=${options.uuid}`);
-    }
-
-    if (hasValue(options.currentPage) && typeof options.currentPage === 'number') {
-      /* TODO: this is a temporary fix for the pagination start index (0 or 1) discrepancy between the rest and the frontend respectively */
-      args.push(`page=${options.currentPage - 1}`);
-    }
-
-    if (hasValue(options.elementsPerPage)) {
-      args.push(`size=${options.elementsPerPage}`);
-    }
-
-    if (hasValue(options.sort)) {
-      args.push(`sort=${options.sort.field},${options.sort.direction}`);
-    }
-
-    if (isNotEmpty(args)) {
-      result = `${result}?${args.join('&')}`;
-    }
-    return result;
-  }
-
-  protected getEntryValueHref(endpoint, options: IntegrationSearchOptions = new IntegrationSearchOptions()): string {
-    let result;
-    const args = [];
-
-    if (hasValue(options.name) && hasValue(options.query)) {
-      result = `${endpoint}/${options.name}/${this.entryValueEndpoint}/${options.query}`;
-    } else {
-      result = endpoint;
-    }
-
-    if (hasValue(options.metadata)) {
-      args.push(`metadata=${options.metadata}`);
-    }
-
-    if (isNotEmpty(args)) {
-      result = `${result}?${args.join('&')}`;
-    }
-
-    return result;
-  }
-
-  public getEntriesByName(options: IntegrationSearchOptions): Observable<IntegrationData> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getEntriesHref(endpoint, options)),
-      filter((href: string) => isNotEmpty(href)),
-      distinctUntilChanged(),
-      map((endpointURL: string) => new IntegrationRequest(this.requestService.generateRequestId(), endpointURL)),
-      tap((request: GetRequest) => this.requestService.configure(request)),
-      mergeMap((request: GetRequest) => this.getData(request)),
-      distinctUntilChanged());
-  }
-
-  public getEntryByValue(options: IntegrationSearchOptions): Observable<IntegrationData> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      map((endpoint: string) => this.getEntryValueHref(endpoint, options)),
-      filter((href: string) => isNotEmpty(href)),
-      distinctUntilChanged(),
-      map((endpointURL: string) => new IntegrationRequest(this.requestService.generateRequestId(), endpointURL)),
-      tap((request: GetRequest) => this.requestService.configure(request)),
-      mergeMap((request: GetRequest) => this.getData(request)),
-      distinctUntilChanged());
-  }
-
-}
diff --git a/src/app/core/integration/models/authority-options.model.ts b/src/app/core/integration/models/authority-options.model.ts
deleted file mode 100644
index 0b826f7f9ca..00000000000
--- a/src/app/core/integration/models/authority-options.model.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export class AuthorityOptions {
-  name: string;
-  metadata: string;
-  scope: string;
-  closed: boolean;
-
-  constructor(name: string,
-              metadata: string,
-              scope: string,
-              closed: boolean = false) {
-    this.name = name;
-    this.metadata = metadata;
-    this.scope = scope;
-    this.closed = closed;
-  }
-}
diff --git a/src/app/core/integration/models/authority.value.ts b/src/app/core/integration/models/authority.value.ts
deleted file mode 100644
index 4e0183603b3..00000000000
--- a/src/app/core/integration/models/authority.value.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { isNotEmpty } from '../../../shared/empty.util';
-import { PLACEHOLDER_PARENT_METADATA } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { OtherInformation } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { typedObject } from '../../cache/builders/build-decorators';
-import { HALLink } from '../../shared/hal-link.model';
-import { MetadataValueInterface } from '../../shared/metadata.models';
-import { AUTHORITY_VALUE } from './authority.resource-type';
-import { IntegrationModel } from './integration.model';
-
-/**
- * Class representing an authority object
- */
-@typedObject
-@inheritSerialization(IntegrationModel)
-export class AuthorityValue extends IntegrationModel implements MetadataValueInterface {
-  static type = AUTHORITY_VALUE;
-
-  /**
-   * The identifier of this authority
-   */
-  @autoserialize
-  id: string;
-
-  /**
-   * The display value of this authority
-   */
-  @autoserialize
-  display: string;
-
-  /**
-   * The value of this authority
-   */
-  @autoserialize
-  value: string;
-
-  /**
-   * An object containing additional information related to this authority
-   */
-  @autoserialize
-  otherInformation: OtherInformation;
-
-  /**
-   * The language code of this authority value
-   */
-  @autoserialize
-  language: string;
-
-  /**
-   * The {@link HALLink}s for this AuthorityValue
-   */
-  @deserialize
-  _links: {
-    self: HALLink,
-  };
-
-  /**
-   * This method checks if authority has an identifier value
-   *
-   * @return boolean
-   */
-  hasAuthority(): boolean {
-    return isNotEmpty(this.id);
-  }
-
-  /**
-   * This method checks if authority has a value
-   *
-   * @return boolean
-   */
-  hasValue(): boolean {
-    return isNotEmpty(this.value);
-  }
-
-  /**
-   * This method checks if authority has related information object
-   *
-   * @return boolean
-   */
-  hasOtherInformation(): boolean {
-    return isNotEmpty(this.otherInformation);
-  }
-
-  /**
-   * This method checks if authority has a placeholder as value
-   *
-   * @return boolean
-   */
-  hasPlaceholder(): boolean {
-    return this.hasValue() && this.value === PLACEHOLDER_PARENT_METADATA;
-  }
-}
diff --git a/src/app/core/integration/models/integration-options.model.ts b/src/app/core/integration/models/integration-options.model.ts
deleted file mode 100644
index 5f158bd47c6..00000000000
--- a/src/app/core/integration/models/integration-options.model.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { SortOptions } from '../../cache/models/sort-options.model';
-
-export class IntegrationSearchOptions {
-
-  constructor(public uuid: string = '',
-              public name: string = '',
-              public metadata: string = '',
-              public query: string = '',
-              public elementsPerPage?: number,
-              public currentPage?: number,
-              public sort?: SortOptions) {
-
-  }
-}
diff --git a/src/app/core/integration/models/integration.model.ts b/src/app/core/integration/models/integration.model.ts
deleted file mode 100644
index d2f21a70c05..00000000000
--- a/src/app/core/integration/models/integration.model.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { autoserialize, deserialize } from 'cerialize';
-import { CacheableObject } from '../../cache/object-cache.reducer';
-import { HALLink } from '../../shared/hal-link.model';
-
-export abstract class IntegrationModel implements CacheableObject {
-
-  @autoserialize
-  self: string;
-
-  @autoserialize
-  uuid: string;
-
-  @autoserialize
-  public type: any;
-
-  @deserialize
-  public _links: {
-    self: HALLink,
-    [name: string]: HALLink
-  }
-
-}
diff --git a/src/app/core/json-patch/builder/json-patch-operations-builder.ts b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
index c45183b4efe..ced37508343 100644
--- a/src/app/core/json-patch/builder/json-patch-operations-builder.ts
+++ b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
@@ -2,14 +2,15 @@ import { Store } from '@ngrx/store';
 import { CoreState } from '../../core.reducers';
 import {
   NewPatchAddOperationAction,
+  NewPatchMoveOperationAction,
   NewPatchRemoveOperationAction,
   NewPatchReplaceOperationAction
 } from '../json-patch-operations.actions';
 import { JsonPatchOperationPathObject } from './json-patch-operation-path-combiner';
 import { Injectable } from '@angular/core';
-import { isEmpty, isNotEmpty } from '../../../shared/empty.util';
+import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
 import { dateToISOFormat } from '../../../shared/date.util';
-import { AuthorityValue } from '../../integration/models/authority.value';
+import { VocabularyEntry } from '../../submission/vocabularies/models/vocabulary-entry.model';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
 
@@ -53,12 +54,35 @@ export class JsonPatchOperationsBuilder {
    *    a boolean representing if the value to be added is a plain text value
    */
   replace(path: JsonPatchOperationPathObject, value, plain = false) {
+    if (hasNoValue(value) || (typeof value === 'object' && hasNoValue(value.value))) {
+      this.remove(path);
+    } else {
+      this.store.dispatch(
+        new NewPatchReplaceOperationAction(
+          path.rootElement,
+          path.subRootElement,
+          path.path,
+          this.prepareValue(value, plain, false)));
+    }
+  }
+
+  /**
+   * Dispatch a new NewPatchMoveOperationAction
+   *
+   * @param path
+   *    the new path tho move to
+   * @param prevPath
+   *    the original path to move from
+   */
+  move(path: JsonPatchOperationPathObject, prevPath: string) {
     this.store.dispatch(
-      new NewPatchReplaceOperationAction(
+      new NewPatchMoveOperationAction(
         path.rootElement,
         path.subRootElement,
-        path.path,
-        this.prepareValue(value, plain, false)));
+        prevPath,
+        path.path
+      )
+    );
   }
 
   /**
@@ -77,7 +101,7 @@ export class JsonPatchOperationsBuilder {
 
   protected prepareValue(value: any, plain: boolean, first: boolean) {
     let operationValue: any = null;
-    if (isNotEmpty(value)) {
+    if (hasValue(value)) {
       if (plain) {
         operationValue = value;
       } else {
@@ -106,10 +130,12 @@ export class JsonPatchOperationsBuilder {
       operationValue = value;
     } else if (value instanceof Date) {
       operationValue = new FormFieldMetadataValueObject(dateToISOFormat(value));
-    } else if (value instanceof AuthorityValue) {
+    } else if (value instanceof VocabularyEntry) {
       operationValue = this.prepareAuthorityValue(value);
     } else if (value instanceof FormFieldLanguageValueObject) {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language);
+    } else if (value.hasOwnProperty('authority')) {
+      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.authority);
     } else if (value.hasOwnProperty('value')) {
       operationValue = new FormFieldMetadataValueObject(value.value);
     } else {
@@ -125,10 +151,10 @@ export class JsonPatchOperationsBuilder {
     return operationValue;
   }
 
-  protected prepareAuthorityValue(value: any) {
-    let operationValue: any = null;
-    if (isNotEmpty(value.id)) {
-      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.id);
+  protected prepareAuthorityValue(value: any): FormFieldMetadataValueObject {
+    let operationValue: FormFieldMetadataValueObject;
+    if (isNotEmpty(value.authority)) {
+      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.authority);
     } else {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language);
     }
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
index c6b21ce0375..e41e164d66f 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
@@ -52,7 +52,7 @@ describe('jsonPatchOperationsReducer test suite', () => {
                     path: '/testResourceType/testResourceId/testField',
                     value: ['test']
                   },
-                  timeAdded: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart
                 },
               ]
             } as JsonPatchOperationsEntry
@@ -75,14 +75,14 @@ describe('jsonPatchOperationsReducer test suite', () => {
                 path: '/testResourceType/testResourceId/testField',
                 value: ['test']
               },
-              timeAdded: timestampBeforeStart
+              timeCompleted: timestampBeforeStart
             },
             {
               operation: {
                 op: 'remove',
                 path: '/testResourceType/testResourceId/testField'
               },
-              timeAdded: timestampBeforeStart
+              timeCompleted: timestampBeforeStart
             },
           ]
         } as JsonPatchOperationsEntry
@@ -203,14 +203,14 @@ describe('jsonPatchOperationsReducer test suite', () => {
                     path: '/testResourceType/testResourceId/testField',
                     value: ['test']
                   },
-                  timeAdded: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart
                 },
                 {
                   operation: {
                     op: 'remove',
                     path: '/testResourceType/testResourceId/testField'
                   },
-                  timeAdded: timestampAfterStart
+                  timeCompleted: timestampAfterStart
                 },
               ]
             } as JsonPatchOperationsEntry
@@ -226,7 +226,7 @@ describe('jsonPatchOperationsReducer test suite', () => {
             op: 'remove',
             path: '/testResourceType/testResourceId/testField'
           },
-          timeAdded: timestampAfterStart
+          timeCompleted: timestampAfterStart
         },
       ];
       expect(newState[testJsonPatchResourceType].transactionStartTime).toBeNull();
@@ -246,14 +246,14 @@ describe('jsonPatchOperationsReducer test suite', () => {
                     path: '/testResourceType/testResourceId/testField',
                     value: ['test']
                   },
-                  timeAdded: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart
                 },
                 {
                   operation: {
                     op: 'remove',
                     path: '/testResourceType/testResourceId/testField'
                   },
-                  timeAdded: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart
                 },
               ]
             } as JsonPatchOperationsEntry,
@@ -265,14 +265,14 @@ describe('jsonPatchOperationsReducer test suite', () => {
                     path: '/testResourceType/testResourceAnotherId/testField',
                     value: ['test']
                   },
-                  timeAdded: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart
                 },
                 {
                   operation: {
                     op: 'remove',
                     path: '/testResourceType/testResourceAnotherId/testField'
                   },
-                  timeAdded: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart
                 },
               ]
             } as JsonPatchOperationsEntry
@@ -295,14 +295,14 @@ describe('jsonPatchOperationsReducer test suite', () => {
             path: '/testResourceType/testResourceAnotherId/testField',
             value: ['test']
           },
-          timeAdded: timestampBeforeStart
+          timeCompleted: timestampBeforeStart
         },
         {
           operation: {
             op: 'remove',
             path: '/testResourceType/testResourceAnotherId/testField'
           },
-          timeAdded: timestampBeforeStart
+          timeCompleted: timestampBeforeStart
         },
       ];
       expect(newState[testJsonPatchResourceType].transactionStartTime).toBeNull();
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.ts b/src/app/core/json-patch/json-patch-operations.reducer.ts
index 906d5e03314..7c352c982ef 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.ts
@@ -20,7 +20,7 @@ import { JsonPatchOperationModel, JsonPatchOperationType } from './json-patch.mo
  */
 export interface JsonPatchOperationObject {
   operation: JsonPatchOperationModel;
-  timeAdded: number;
+  timeCompleted: number;
 }
 
 /**
@@ -196,7 +196,8 @@ function newOperation(state: JsonPatchOperationsState, action): JsonPatchOperati
     body,
     action.type,
     action.payload.path,
-    hasValue(action.payload.value) ? action.payload.value : null);
+    hasValue(action.payload.value) ? action.payload.value : null,
+    hasValue(action.payload.from) ? action.payload.from : null);
 
   if (hasValue(newState[ action.payload.resourceType ])
     && hasValue(newState[ action.payload.resourceType ].children)) {
@@ -263,7 +264,7 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
         newChildren = Object.assign({}, state[ action.payload.resourceType ].children, {
           [action.payload.resourceId]: {
             body: state[ action.payload.resourceType ].children[ action.payload.resourceId ].body
-              .filter((entry) => entry.timeAdded > state[ action.payload.resourceType ].transactionStartTime)
+              .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime)
           }
         });
       } else {
@@ -277,7 +278,7 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
           newChildren = Object.assign({}, newChildren, {
             [resourceId]: {
               body: newChildren[ resourceId ].body
-                .filter((entry) => entry.timeAdded > state[ action.payload.resourceType ].transactionStartTime)
+                .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime)
             }
           });
         })
@@ -293,7 +294,21 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
   }
 }
 
-function addOperationToList(body: JsonPatchOperationObject[], actionType, targetPath, value?) {
+/**
+ * Add a new operation to a patch
+ *
+ * @param body
+ *    The current patch
+ * @param actionType
+ *    The type of operation to add
+ * @param targetPath
+ *    The path for the operation
+ * @param value
+ *    The new value
+ * @param fromPath
+ *    The previous path (in case of a move operation)
+ */
+function addOperationToList(body: JsonPatchOperationObject[], actionType, targetPath, value?, fromPath?) {
   const newBody = Array.from(body);
   switch (actionType) {
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_ADD_OPERATION:
@@ -313,10 +328,13 @@ function addOperationToList(body: JsonPatchOperationObject[], actionType, target
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_REMOVE_OPERATION:
       newBody.push(makeOperationEntry({ op: JsonPatchOperationType.remove, path: targetPath }));
       break;
+    case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_MOVE_OPERATION:
+      newBody.push(makeOperationEntry({ op: JsonPatchOperationType.move, from: fromPath, path: targetPath }));
+      break;
   }
   return newBody;
 }
 
 function makeOperationEntry(operation) {
-  return { operation: operation, timeAdded: new Date().getTime() };
+  return { operation: operation, timeCompleted: new Date().getTime() };
 }
diff --git a/src/app/core/json-patch/json-patch-operations.service.spec.ts b/src/app/core/json-patch/json-patch-operations.service.spec.ts
index 583b90a01fd..1107d27e56c 100644
--- a/src/app/core/json-patch/json-patch-operations.service.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.spec.ts
@@ -1,10 +1,8 @@
-import { async, TestBed } from '@angular/core/testing';
-
-import { getTestScheduler } from 'jasmine-marbles';
+import { getTestScheduler, hot } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import { of as observableOf } from 'rxjs';
-import { Store, StoreModule } from '@ngrx/store';
-
+import { catchError } from 'rxjs/operators';
+import { Store } from '@ngrx/store';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { RequestService } from '../data/request.service';
 import { SubmissionPatchRequest } from '../data/request.models';
@@ -21,10 +19,9 @@ import {
   RollbacktPatchOperationsAction,
   StartTransactionPatchOperationsAction
 } from './json-patch-operations.actions';
-import { StoreMock } from '../../shared/testing/store.mock';
 import { RequestEntry } from '../data/request.reducer';
-import { catchError } from 'rxjs/operators';
-import { storeModuleConfig } from '../../app.reducer';
+import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { _deepClone } from 'fast-json-patch/lib/helpers';
 
 class TestService extends JsonPatchOperationsService<SubmitDataResponseDefinitionObject, SubmissionPatchRequest> {
   protected linkPath = '';
@@ -33,7 +30,8 @@ class TestService extends JsonPatchOperationsService<SubmitDataResponseDefinitio
   constructor(
     protected requestService: RequestService,
     protected store: Store<CoreState>,
-    protected halService: HALEndpointService) {
+    protected halService: HALEndpointService,
+    protected rdbService: RemoteDataBuildService) {
 
     super();
   }
@@ -61,7 +59,7 @@ describe('JsonPatchOperationsService test suite', () => {
                   path: '/testResourceType/testResourceId/testField',
                   value: ['test']
                 },
-                timeAdded: timestamp
+                timeCompleted: timestamp
               },
             ]
           } as JsonPatchOperationsEntry
@@ -86,7 +84,7 @@ describe('JsonPatchOperationsService test suite', () => {
 
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, timeAdded: timestampResponse } as any
+      response: { isSuccessful: successful, timeCompleted: timestampResponse } as any
     } as RequestEntry)
   };
 
@@ -94,32 +92,41 @@ describe('JsonPatchOperationsService test suite', () => {
     return new TestService(
       requestService,
       store,
-      halService
+      halService,
+      rdbService
     );
 
   }
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({}, storeModuleConfig),
-      ],
-      providers: [
-        { provide: Store, useClass: StoreMock }
-      ]
-    }).compileComponents();
-  }));
+  function getStore() {
+    return jasmine.createSpyObj('store', {
+      dispatch: {},
+      select: observableOf(mockState['json/patch'][testJsonPatchResourceType]),
+      pipe: observableOf(true)
+    });
+  }
+
+  function spyOnRdbServiceAndReturnSuccessfulRemoteData() {
+    spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(
+      observableOf(Object.assign(createSuccessfulRemoteDataObject({ dataDefinition: 'test' }), { timeCompleted: new Date().getTime() + 10000 }))
+    );
+  }
+
+  function spyOnRdbServiceAndReturnFailedRemoteData() {
+    spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(
+      observableOf(Object.assign(createFailedRemoteDataObject('Error', 500), { timeCompleted: new Date().getTime() + 10000 }))
+    );
+  }
 
   beforeEach(() => {
-    store = TestBed.get(Store);
+    store = getStore();
     requestService = getMockRequestService(getRequestEntry$(true));
     rdbService = getMockRemoteDataBuildService();
     scheduler = getTestScheduler();
     halService = new HALEndpointServiceStub(resourceEndpointURL);
     service = initTestService();
+    spyOnRdbServiceAndReturnSuccessfulRemoteData();
 
-    spyOn(store, 'select').and.returnValue(observableOf(mockState['json/patch'][testJsonPatchResourceType]));
-    spyOn(store, 'dispatch').and.callThrough();
     spyOn(Date.prototype, 'getTime').and.callFake(() => {
       return timestamp;
     });
@@ -164,12 +171,13 @@ describe('JsonPatchOperationsService test suite', () => {
 
     describe('when request is not successful', () => {
       beforeEach(() => {
-        store = TestBed.get(Store);
+        store = getStore();
         requestService = getMockRequestService(getRequestEntry$(false));
         rdbService = getMockRemoteDataBuildService();
         scheduler = getTestScheduler();
         halService = new HALEndpointServiceStub(resourceEndpointURL);
         service = initTestService();
+        spyOnRdbServiceAndReturnFailedRemoteData();
 
         store.select.and.returnValue(observableOf(mockState['json/patch'][testJsonPatchResourceType]));
         store.dispatch.and.callThrough();
@@ -188,6 +196,32 @@ describe('JsonPatchOperationsService test suite', () => {
     });
   });
 
+  describe('hasPendingOperations', () => {
+
+    it('should return true when there are pending operations', () => {
+
+      const expected = hot('(x|)', { x: true });
+
+      const result = service.hasPendingOperations(testJsonPatchResourceType);
+      expect(result).toBeObservable(expected);
+
+    });
+
+    it('should return false when there are not pending operations', () => {
+
+      const mockStateNoOp = _deepClone(mockState);
+      mockStateNoOp['json/patch'][testJsonPatchResourceType].children = [];
+      store.select.and.returnValue(observableOf(mockStateNoOp['json/patch'][testJsonPatchResourceType]));
+
+      const expected = hot('(x|)', { x: false });
+
+      const result = service.hasPendingOperations(testJsonPatchResourceType);
+      expect(result).toBeObservable(expected);
+
+    });
+
+  });
+
   describe('jsonPatchByResourceID', () => {
 
     it('should call submitJsonPatchOperations method', () => {
@@ -227,12 +261,13 @@ describe('JsonPatchOperationsService test suite', () => {
 
     describe('when request is not successful', () => {
       beforeEach(() => {
-        store = TestBed.get(Store);
+        store = getStore();
         requestService = getMockRequestService(getRequestEntry$(false));
         rdbService = getMockRemoteDataBuildService();
         scheduler = getTestScheduler();
         halService = new HALEndpointServiceStub(resourceEndpointURL);
         service = initTestService();
+        spyOnRdbServiceAndReturnFailedRemoteData();
 
         store.select.and.returnValue(observableOf(mockState['json/patch'][testJsonPatchResourceType]));
         store.dispatch.and.callThrough();
diff --git a/src/app/core/json-patch/json-patch-operations.service.ts b/src/app/core/json-patch/json-patch-operations.service.ts
index c1b37bf9049..5cf3d503a67 100644
--- a/src/app/core/json-patch/json-patch-operations.service.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.ts
@@ -1,9 +1,23 @@
-import { merge as observableMerge, Observable, throwError as observableThrowError } from 'rxjs';
-import { distinctUntilChanged, filter, find, flatMap, map, partition, take, tap } from 'rxjs/operators';
+import { merge as observableMerge, Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  flatMap,
+  map,
+  partition,
+  take,
+  tap
+} from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
-import { ErrorResponse, PostPatchSuccessResponse, RestResponse } from '../cache/response.models';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+  isUndefined
+} from '../../shared/empty.util';
 import { PatchRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -16,7 +30,9 @@ import {
   StartTransactionPatchOperationsAction
 } from './json-patch-operations.actions';
 import { JsonPatchOperationModel } from './json-patch.model';
-import { getResponseFromEntry } from '../shared/operators';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RemoteData } from '../data/remote-data';
 
 /**
  * An abstract class that provides methods to make JSON Patch requests.
@@ -27,6 +43,7 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
   protected abstract store: Store<CoreState>;
   protected abstract linkPath: string;
   protected abstract halService: HALEndpointService;
+  protected abstract rdbService: RemoteDataBuildService;
   protected abstract patchRequestConstructor: any;
 
   /**
@@ -85,20 +102,20 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
         tap(() => this.store.dispatch(new StartTransactionPatchOperationsAction(resourceType, resourceId, startTransactionTime))),
         tap((request: PatchRequestDefinition) => this.requestService.configure(request)),
         flatMap(() => {
-          const [successResponse$, errorResponse$] = partition((response: RestResponse) => response.isSuccessful)(this.requestService.getByUUID(requestId).pipe(
-            getResponseFromEntry(),
-            find((entry: RestResponse) => startTransactionTime < entry.timeAdded),
-            map((entry: RestResponse) => entry),
-          ));
-          return observableMerge(
-            errorResponse$.pipe(
-              tap(() => this.store.dispatch(new RollbacktPatchOperationsAction(resourceType, resourceId))),
-              flatMap((error: ErrorResponse) => observableThrowError(error))),
-            successResponse$.pipe(
-              filter((response: PostPatchSuccessResponse) => isNotEmpty(response)),
-              tap(() => this.store.dispatch(new CommitPatchOperationsAction(resourceType, resourceId))),
-              map((response: PostPatchSuccessResponse) => response.dataDefinition),
-              distinctUntilChanged()));
+          return this.rdbService.buildFromRequestUUID(requestId).pipe(
+            getFirstCompletedRemoteData(),
+            find((rd: RemoteData<any>) => startTransactionTime < rd.timeCompleted),
+            map((rd: RemoteData<any>) => {
+              if (rd.hasFailed) {
+                this.store.dispatch(new RollbacktPatchOperationsAction(resourceType, resourceId));
+                throw new Error(rd.errorMessage);
+              } else if (hasValue(rd.payload) && isNotEmpty(rd.payload.dataDefinition)) {
+                this.store.dispatch(new CommitPatchOperationsAction(resourceType, resourceId));
+                return rd.payload.dataDefinition;
+              }
+            }),
+            distinctUntilChanged()
+        )
         }))
     );
   }
@@ -144,6 +161,18 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
     return this.submitJsonPatchOperations(href$, resourceType);
   }
 
+  /**
+   * Select the jsonPatch operation related to the specified resource type.
+   * @param resourceType
+   */
+  public hasPendingOperations(resourceType: string): Observable<boolean> {
+    return this.store.select(jsonPatchOperationsByResourceType(resourceType)).pipe(
+      map((val) =>  !isEmpty(val) && Object.values(val.children)
+        .filter((section) => !isEmpty((section as any).body)).length > 0),
+      distinctUntilChanged(),
+    );
+  }
+
   /**
    * Make a new JSON Patch request with all operations related to the specified resource id
    *
diff --git a/src/app/core/locale/locale.interceptor.spec.ts b/src/app/core/locale/locale.interceptor.spec.ts
new file mode 100644
index 00000000000..b9a33a1d4ae
--- /dev/null
+++ b/src/app/core/locale/locale.interceptor.spec.ts
@@ -0,0 +1,74 @@
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController, } from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { LocaleService } from './locale.service';
+import { LocaleInterceptor } from './locale.interceptor';
+import { of } from 'rxjs';
+
+describe(`LocaleInterceptor`, () => {
+  let service: DspaceRestService;
+  let httpMock: HttpTestingController;
+  let localeService: any;
+
+  const languageList = ['en;q=1', 'it;q=0.9', 'de;q=0.8', 'fr;q=0.7'];
+
+  const mockLocaleService = jasmine.createSpyObj('LocaleService', {
+    getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
+    getLanguageCodeList: of(languageList)
+  })
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        DspaceRestService,
+        {
+          provide: HTTP_INTERCEPTORS,
+          useClass: LocaleInterceptor,
+          multi: true,
+        },
+        {provide: LocaleService, useValue: mockLocaleService},
+      ],
+    });
+
+    service = TestBed.get(DspaceRestService);
+    httpMock = TestBed.get(HttpTestingController);
+    localeService = TestBed.get(LocaleService);
+
+    localeService.getCurrentLanguageCode.and.returnValue('en')
+  });
+
+  describe('', () => {
+
+    it('should add an Accept-Language header when we’re sending an HTTP POST request', () => {
+      service.request(RestRequestMethod.POST, 'server/api/submission/workspaceitems', 'test').subscribe((response) => {
+        expect(response).toBeTruthy();
+      });
+
+      const httpRequest = httpMock.expectOne(`server/api/submission/workspaceitems`);
+
+      expect(httpRequest.request.headers.has('Accept-Language'));
+      const lang = httpRequest.request.headers.get('Accept-Language');
+      expect(lang).toBeDefined();
+      expect(lang).toBe(languageList.toString());
+    });
+
+    it('should add an Accept-Language header when we’re sending an HTTP GET request', () => {
+      service.request(RestRequestMethod.GET, 'server/api/submission/workspaceitems/123').subscribe((response) => {
+        expect(response).toBeTruthy();
+      });
+
+      const httpRequest = httpMock.expectOne(`server/api/submission/workspaceitems/123`);
+
+      expect(httpRequest.request.headers.has('Accept-Language'));
+      const lang = httpRequest.request.headers.get('Accept-Language');
+      expect(lang).toBeDefined();
+      expect(lang).toBe(languageList.toString());
+    });
+
+  });
+
+});
diff --git a/src/app/core/locale/locale.interceptor.ts b/src/app/core/locale/locale.interceptor.ts
new file mode 100644
index 00000000000..9327db5d380
--- /dev/null
+++ b/src/app/core/locale/locale.interceptor.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+
+import { Observable } from 'rxjs';
+
+import { LocaleService } from './locale.service';
+import { mergeMap, scan } from 'rxjs/operators';
+
+@Injectable()
+export class LocaleInterceptor implements HttpInterceptor {
+
+  constructor(private localeService: LocaleService) {
+  }
+
+  /**
+   * Intercept method
+   * @param req
+   * @param next
+   */
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    let newReq: HttpRequest<any>;
+    return this.localeService.getLanguageCodeList()
+      .pipe(
+        scan((acc: any, value: any) => [...acc, ...value], []),
+        mergeMap((languages) => {
+          // Clone the request to add the new header.
+          newReq = req.clone({
+            headers: req.headers
+              .set('Accept-Language', languages.toString())
+          });
+          // Pass on the new request instead of the original request.
+          return next.handle(newReq);
+        }))
+  }
+}
diff --git a/src/app/core/locale/locale.service.spec.ts b/src/app/core/locale/locale.service.spec.ts
new file mode 100644
index 00000000000..67a4d61bf3c
--- /dev/null
+++ b/src/app/core/locale/locale.service.spec.ts
@@ -0,0 +1,125 @@
+import { async, TestBed } from '@angular/core/testing';
+
+import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+
+import { CookieService } from '../services/cookie.service';
+import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { LANG_COOKIE, LocaleService, LANG_ORIGIN } from './locale.service';
+import { AuthService } from '../auth/auth.service';
+import { AuthServiceMock } from 'src/app/shared/mocks/auth.service.mock';
+import { NativeWindowRef } from '../services/window.service';
+
+describe('LocaleService test suite', () => {
+  let service: LocaleService;
+  let serviceAsAny: any;
+  let cookieService: CookieService;
+  let translateService: TranslateService;
+  let authService: AuthService;
+  let window;
+  let spyOnGet;
+  let spyOnSet;
+
+  const langList = ['en', 'it', 'de'];
+
+  beforeEach(async(() => {
+    return TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+      ],
+      providers: [
+        { provide: CookieService, useValue: new CookieServiceMock() },
+        { provide: AuthService, userValue: AuthServiceMock }
+      ]
+    });
+  }));
+
+  beforeEach(() => {
+    cookieService = TestBed.get(CookieService);
+    translateService = TestBed.get(TranslateService);
+    authService = TestBed.get(TranslateService);
+    window = new NativeWindowRef();
+    service = new LocaleService(window, cookieService, translateService, authService);
+    serviceAsAny = service;
+    spyOnGet = spyOn(cookieService, 'get');
+    spyOnSet = spyOn(cookieService, 'set');
+  });
+
+  describe('getCurrentLanguageCode', () => {
+    it('should return language saved on cookie', () => {
+      spyOnGet.and.returnValue('de');
+      expect(service.getCurrentLanguageCode()).toBe('de');
+    });
+
+    describe('', () => {
+      beforeEach(() => {
+        spyOn(translateService, 'getLangs').and.returnValue(langList);
+      });
+
+      it('should return language from browser setting', () => {
+        spyOn(translateService, 'getBrowserLang').and.returnValue('it');
+        expect(service.getCurrentLanguageCode()).toBe('it');
+      });
+
+      it('should return default language from config', () => {
+        spyOn(translateService, 'getBrowserLang').and.returnValue('fr');
+        expect(service.getCurrentLanguageCode()).toBe('en');
+      });
+    });
+  });
+
+  describe('getLanguageCodeFromCookie', () => {
+    it('should return language from cookie', () => {
+      spyOnGet.and.returnValue('de');
+      expect(service.getLanguageCodeFromCookie()).toBe('de');
+    });
+
+  });
+
+  describe('saveLanguageCodeToCookie', () => {
+    it('should save language to cookie', () => {
+      service.saveLanguageCodeToCookie('en');
+      expect(spyOnSet).toHaveBeenCalledWith(LANG_COOKIE, 'en');
+    });
+  });
+
+  describe('setCurrentLanguageCode', () => {
+    beforeEach(() => {
+      spyOn(service, 'saveLanguageCodeToCookie');
+      spyOn(translateService, 'use');
+    });
+
+    it('should set the given language', () => {
+      service.setCurrentLanguageCode('it');
+      expect(translateService.use).toHaveBeenCalledWith( 'it');
+      expect(service.saveLanguageCodeToCookie).toHaveBeenCalledWith('it');
+    });
+
+    it('should set the current language', () => {
+      spyOn(service, 'getCurrentLanguageCode').and.returnValue('es');
+      service.setCurrentLanguageCode();
+      expect(translateService.use).toHaveBeenCalledWith( 'es');
+      expect(service.saveLanguageCodeToCookie).toHaveBeenCalledWith('es');
+    });
+  });
+
+  describe('', () => {
+    it('should set quality to current language list', () => {
+      const langListWithQuality = ['en;q=1', 'it;q=0.9', 'de;q=0.8'];
+      spyOn(service, 'setQuality').and.returnValue(langListWithQuality);
+      service.setQuality(langList, LANG_ORIGIN.BROWSER, false);
+      expect(service.setQuality).toHaveBeenCalledWith(langList, LANG_ORIGIN.BROWSER, false);
+    });
+
+    it('should return the list of language with quality factor', () => {
+      spyOn(service, 'getLanguageCodeList');
+      service.getLanguageCodeList();
+      expect(service.getLanguageCodeList).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/core/locale/locale.service.ts b/src/app/core/locale/locale.service.ts
new file mode 100644
index 00000000000..315fc02833c
--- /dev/null
+++ b/src/app/core/locale/locale.service.ts
@@ -0,0 +1,193 @@
+import { Injectable, Inject } from '@angular/core';
+
+import { TranslateService } from '@ngx-translate/core';
+
+import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { CookieService } from '../services/cookie.service';
+import { environment } from '../../../environments/environment';
+import { AuthService } from '../auth/auth.service';
+import { Observable, of as observableOf, combineLatest } from 'rxjs';
+import { map, take, flatMap } from 'rxjs/operators';
+import { NativeWindowService, NativeWindowRef } from '../services/window.service';
+
+export const LANG_COOKIE = 'dsLanguage';
+
+/**
+ * This enum defines the possible origin of the languages
+ */
+export enum LANG_ORIGIN {
+  UI,
+  EPERSON,
+  BROWSER
+}
+
+/**
+ * Service to provide localization handler
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class LocaleService {
+
+  /**
+   * Eperson language metadata
+   */
+  EPERSON_LANG_METADATA = 'eperson.language';
+
+  constructor(
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    protected cookie: CookieService,
+    protected translate: TranslateService,
+    protected authService: AuthService) {
+  }
+
+  /**
+   * Get the language currently used
+   *
+   * @returns {string} The language code
+   */
+  getCurrentLanguageCode(): string {
+    // Attempt to get the language from a cookie
+    let lang = this.getLanguageCodeFromCookie();
+    if (isEmpty(lang)) {
+      // Cookie not found
+      // Attempt to get the browser language from the user
+      if (this.translate.getLangs().includes(this.translate.getBrowserLang())) {
+        lang = this.translate.getBrowserLang();
+      } else {
+        lang = environment.defaultLanguage;
+      }
+    }
+    return lang;
+  }
+
+  /**
+   * Get the languages list of the user in Accept-Language format
+   *
+   * @returns {Observable<string[]>}
+   */
+  getLanguageCodeList(): Observable<string[]> {
+    const obs$ = combineLatest([
+      this.authService.isAuthenticated(),
+      this.authService.isAuthenticationLoaded()
+    ]);
+
+    return obs$.pipe(
+      take(1),
+      flatMap(([isAuthenticated, isLoaded]) => {
+        // TODO to enabled again when https://github.com/DSpace/dspace-angular/issues/739 will be resolved
+        const epersonLang$: Observable<string[]> = observableOf([]);
+/*        if (isAuthenticated && isLoaded) {
+          epersonLang$ = this.authService.getAuthenticatedUserFromStore().pipe(
+            take(1),
+            map((eperson) => {
+              const languages: string[] = [];
+              const ePersonLang = eperson.firstMetadataValue(this.EPERSON_LANG_METADATA);
+              if (ePersonLang) {
+                languages.push(...this.setQuality(
+                  [ePersonLang],
+                  LANG_ORIGIN.EPERSON,
+                  !isEmpty(this.translate.currentLang)));
+              }
+              return languages;
+            })
+          );
+        }*/
+        return epersonLang$.pipe(
+          map((epersonLang: string[]) => {
+            const languages: string[] = [];
+            if (this.translate.currentLang) {
+              languages.push(...this.setQuality(
+                [this.translate.currentLang],
+                LANG_ORIGIN.UI,
+                false));
+            }
+            if (isNotEmpty(epersonLang)) {
+              languages.push(...epersonLang);
+            }
+            if (navigator.languages) {
+              languages.push(...this.setQuality(
+                Object.assign([], navigator.languages),
+                LANG_ORIGIN.BROWSER,
+                !isEmpty(this.translate.currentLang))
+              );
+            }
+            return languages;
+          })
+        )
+      })
+    );
+  }
+
+  /**
+   * Retrieve the language from a cookie
+   */
+  getLanguageCodeFromCookie(): string {
+    return this.cookie.get(LANG_COOKIE);
+  }
+
+  /**
+   * Set the language currently used
+   *
+   * @param lang
+   *  The language to save
+   */
+  saveLanguageCodeToCookie(lang: string): void {
+    this.cookie.set(LANG_COOKIE, lang);
+  }
+
+  /**
+   * Set the language currently used
+   *
+   * @param lang
+   *  The language to set, if it's not provided retrieve default one
+   */
+  setCurrentLanguageCode(lang?: string): void {
+    if (isEmpty(lang)) {
+      lang = this.getCurrentLanguageCode()
+    }
+    this.translate.use(lang);
+    this.saveLanguageCodeToCookie(lang);
+  }
+
+  /**
+   * Set the quality factor for all element of input array.
+   * Returns a new array that contains the languages list with the quality value.
+   * The quality factor indicate the relative degree of preference for the language
+   * @param languages the languages list
+   * @param origin origin of language list (UI, EPERSON, BROWSER)
+   * @param hasOther true if contains other language, false otherwise
+   */
+  setQuality(languages: string[], origin: LANG_ORIGIN, hasOther: boolean): string[] {
+    const langWithPrior = [];
+    let idx = 0;
+    const v = languages.length > 10 ? languages.length : 10;
+    let divisor: number;
+    switch (origin) {
+      case LANG_ORIGIN.EPERSON:
+        divisor = 2; break;
+      case LANG_ORIGIN.BROWSER:
+        divisor = (hasOther ? 10 : 1); break;
+      default:
+        divisor = 1;
+    }
+    languages.forEach( (lang) => {
+        let value = lang + ';q=';
+        let quality = (v - idx++) / v;
+        quality = ((languages.length > 10) ? quality.toFixed(2) : quality) as number;
+        value += quality / divisor;
+        langWithPrior.push(value);
+    });
+    return langWithPrior;
+  }
+
+  /**
+   * Refresh route navigated
+   */
+  public refreshAfterChangeLanguage() {
+    // Hard redirect to the reload page with a unique number behind it
+    // so that all state is definitely lost
+    this._window.nativeWindow.location.href = `/reload/${new Date().getTime()}`;
+  }
+
+}
diff --git a/src/app/core/locale/server-locale.service.ts b/src/app/core/locale/server-locale.service.ts
new file mode 100644
index 00000000000..b33338240fb
--- /dev/null
+++ b/src/app/core/locale/server-locale.service.ts
@@ -0,0 +1,60 @@
+import { LocaleService, LANG_ORIGIN } from './locale.service';
+import { Injectable } from '@angular/core';
+import { Observable, combineLatest, of as observableOf } from 'rxjs';
+import { take, flatMap, map } from 'rxjs/operators';
+import { isNotEmpty, isEmpty } from 'src/app/shared/empty.util';
+
+@Injectable()
+export class ServerLocaleService extends LocaleService {
+
+  /**
+   * Get the languages list of the user in Accept-Language format
+   *
+   * @returns {Observable<string[]>}
+   */
+  getLanguageCodeList(): Observable<string[]> {
+    const obs$ = combineLatest([
+      this.authService.isAuthenticated(),
+      this.authService.isAuthenticationLoaded()
+    ]);
+
+    return obs$.pipe(
+      take(1),
+      flatMap(([isAuthenticated, isLoaded]) => {
+        let epersonLang$: Observable<string[]> = observableOf([]);
+        if (isAuthenticated && isLoaded) {
+          epersonLang$ = this.authService.getAuthenticatedUserFromStore().pipe(
+            take(1),
+            map((eperson) => {
+              const languages: string[] = [];
+              const ePersonLang = eperson.firstMetadataValue(this.EPERSON_LANG_METADATA);
+              if (ePersonLang) {
+                languages.push(...this.setQuality(
+                  [ePersonLang],
+                  LANG_ORIGIN.EPERSON,
+                  !isEmpty(this.translate.currentLang)));
+              }
+              return languages;
+            })
+          );
+        }
+        return epersonLang$.pipe(
+          map((epersonLang: string[]) => {
+            const languages: string[] = [];
+            if (this.translate.currentLang) {
+              languages.push(...this.setQuality(
+                [this.translate.currentLang],
+                LANG_ORIGIN.UI,
+                false));
+            }
+            if (isNotEmpty(epersonLang)) {
+              languages.push(...epersonLang);
+            }
+            return languages;
+          })
+        )
+      })
+    );
+  }
+
+}
diff --git a/src/app/core/metadata/metadata-field.model.ts b/src/app/core/metadata/metadata-field.model.ts
index ad7ec59b25f..18840278c44 100644
--- a/src/app/core/metadata/metadata-field.model.ts
+++ b/src/app/core/metadata/metadata-field.model.ts
@@ -9,6 +9,9 @@ import { ResourceType } from '../shared/resource-type';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { METADATA_FIELD } from './metadata-field.resource-type';
 import { MetadataSchema } from './metadata-schema.model';
+import { RemoteData } from '../data/remote-data';
+import { Observable } from 'rxjs';
+import { METADATA_SCHEMA } from './metadata-schema.resource-type';
 
 /**
  * Class the represents a metadata field
@@ -61,16 +64,15 @@ export class MetadataField extends ListableObject implements HALResource {
    * The MetadataSchema for this MetadataField
    * Will be undefined unless the schema {@link HALLink} has been resolved.
    */
-  // TODO the responseparsingservice assumes schemas are always embedded. This should use remotedata, and be a link instead.
-  // @link(METADATA_SCHEMA)
-  schema?: MetadataSchema;
+  @link(METADATA_SCHEMA)
+  schema?: Observable<RemoteData<MetadataSchema>>;
 
   /**
-   * Method to print this metadata field as a string
-   * @param separator The separator between the schema, element and qualifier in the string
+   * Method to print this metadata field as a string without the schema
+   * @param separator The separator between element and qualifier in the string
    */
   toString(separator: string = '.'): string {
-    let key = this.schema.prefix + separator + this.element;
+    let key = this.element;
     if (isNotEmpty(this.qualifier)) {
       key += separator + this.qualifier;
     }
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index c21cf505129..2dc9f02b190 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -39,7 +39,7 @@ import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 
 import { ItemDataService } from '../data/item-data.service';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../data/paginated-list.model';
 import { FindListOptions } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
@@ -52,10 +52,13 @@ import { UUIDService } from '../shared/uuid.service';
 import { MetadataService } from './metadata.service';
 import { environment } from '../../../environments/environment';
 import { storeModuleConfig } from '../../app.reducer';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 /* tslint:disable:max-classes-per-file */
 @Component({
-  template: `<router-outlet></router-outlet>`
+  template: `
+      <router-outlet></router-outlet>`
 })
 class TestComponent {
   constructor(private metadata: MetadataService) {
@@ -108,9 +111,9 @@ describe('MetadataService', () => {
     const mockBitstreamDataService = {
       findAllByItemAndBundleName(item: Item, bundleName: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
         if (item.equals(ItemMock)) {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [MockBitstream1, MockBitstream2]));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [MockBitstream1, MockBitstream2]));
         } else {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
         }
       },
     };
@@ -168,7 +171,9 @@ describe('MetadataService', () => {
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         Meta,
         Title,
-        ItemDataService,
+        // tslint:disable-next-line:no-empty
+        { provide: ItemDataService, useValue: { findById: () => {} } },
+        { provide: HardRedirectService, useValue: { rewriteDownloadURL: (a) => a, getRequestOrigin: () => environment.ui.baseUrl }},
         BrowseService,
         MetadataService
       ],
@@ -207,7 +212,7 @@ describe('MetadataService', () => {
     tick();
     expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_dissertation_institution')[0].content).toEqual('Mock Publisher');
-    expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual([environment.ui.baseUrl, router.url].join(''));
+    expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual(new URLCombiner(environment.ui.baseUrl, router.url).toString());
     expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content');
   }));
 
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 02d2b0c86ba..90171bac101 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 
 import { Meta, MetaDefinition, Title } from '@angular/platform-browser';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
@@ -20,7 +20,8 @@ import { Bitstream } from '../shared/bitstream.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
 import { getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteListPayload } from '../shared/operators';
-import { environment } from '../../../environments/environment';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 @Injectable()
 export class MetadataService {
@@ -39,6 +40,7 @@ export class MetadataService {
     private dsoNameService: DSONameService,
     private bitstreamDataService: BitstreamDataService,
     private bitstreamFormatDataService: BitstreamFormatDataService,
+    private redirectService: HardRedirectService
   ) {
     // TODO: determine what open graph meta tags are needed and whether
     // the differ per route. potentially add image based on DSpaceObject
@@ -254,7 +256,7 @@ export class MetadataService {
    */
   private setCitationAbstractUrlTag(): void {
     if (this.currentObject.value instanceof Item) {
-      const value = [environment.ui.baseUrl, this.router.url].join('');
+      const value = new URLCombiner(this.redirectService.getRequestOrigin(), this.router.url).toString();
       this.addMetaTag('citation_abstract_html_url', value);
     }
   }
@@ -279,7 +281,8 @@ export class MetadataService {
               getFirstSucceededRemoteDataPayload()
             ).subscribe((format: BitstreamFormat) => {
               if (format.mimetype === 'application/pdf') {
-                this.addMetaTag('citation_pdf_url', bitstream._links.content.href);
+                const rewrittenURL= this.redirectService.rewriteDownloadURL(bitstream._links.content.href);
+                this.addMetaTag('citation_pdf_url', rewrittenURL);
               }
             });
           }
diff --git a/src/app/core/registry/registry-bitstreamformats-response.model.ts b/src/app/core/registry/registry-bitstreamformats-response.model.ts
deleted file mode 100644
index 4da30b4ffc9..00000000000
--- a/src/app/core/registry/registry-bitstreamformats-response.model.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { autoserialize, deserialize } from 'cerialize';
-import { BITSTREAM_FORMAT } from '../shared/bitstream-format.resource-type';
-import { HALLink } from '../shared/hal-link.model';
-import { PageInfo } from '../shared/page-info.model';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
-import { link } from '../cache/builders/build-decorators';
-
-export class RegistryBitstreamformatsResponse {
-  @autoserialize
-  page: PageInfo;
-
-  /**
-   * The {@link HALLink}s for this RegistryBitstreamformatsResponse
-   */
-  @deserialize
-  _links: {
-    self: HALLink;
-    bitstreamformats: HALLink;
-  };
-
-  @link(BITSTREAM_FORMAT)
-  bitstreamformats?: BitstreamFormat[];
-
-}
diff --git a/src/app/core/registry/registry-metadatafields-response.model.ts b/src/app/core/registry/registry-metadatafields-response.model.ts
deleted file mode 100644
index 5dc492ab0f5..00000000000
--- a/src/app/core/registry/registry-metadatafields-response.model.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { autoserialize, deserialize } from 'cerialize';
-import { typedObject } from '../cache/builders/build-decorators';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
-import { HALLink } from '../shared/hal-link.model';
-import { PageInfo } from '../shared/page-info.model';
-import { ResourceType } from '../shared/resource-type';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-
-/**
- * Class that represents a response with a registry's metadata fields
- */
-@typedObject
-export class RegistryMetadatafieldsResponse {
-  static type = METADATA_FIELD;
-
-  /**
-   * The object type
-   */
-  @excludeFromEquals
-  @autoserialize
-  type: ResourceType;
-
-  /**
-   * List of metadata fields in the response
-   */
-  @deserialize
-  metadatafields: MetadataField[];
-
-  /**
-   * Page info of this response
-   */
-  @autoserialize
-  page: PageInfo;
-
-  /**
-   * The REST link to this response
-   */
-  @autoserialize
-  self: string;
-
-  @deserialize
-  _links: {
-    self: HALLink,
-  }
-}
diff --git a/src/app/core/registry/registry-metadataschemas-response.model.ts b/src/app/core/registry/registry-metadataschemas-response.model.ts
deleted file mode 100644
index 7a485d8849b..00000000000
--- a/src/app/core/registry/registry-metadataschemas-response.model.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { autoserialize, deserialize } from 'cerialize';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-
-export class RegistryMetadataschemasResponse {
-  @deserialize
-  metadataschemas: MetadataSchema[];
-
-  @autoserialize
-  page: PageInfo;
-
-  @autoserialize
-  self: string;
-}
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index d1d817ff366..7d916a7fdbf 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -3,8 +3,7 @@ import { Component } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, of as observableOf } from 'rxjs';
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -17,30 +16,23 @@ import {
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
 } from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { StoreMock } from '../../shared/testing/store.mock';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-
-import {
-  RegistryMetadatafieldsSuccessResponse,
-  RegistryMetadataschemasSuccessResponse,
-  RestResponse
-} from '../cache/response.models';
-import { RemoteData } from '../data/remote-data';
-import { RequestEntry } from '../data/request.reducer';
-import { RequestService } from '../data/request.service';
 import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { PageInfo } from '../shared/page-info.model';
-import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
 import { RegistryService } from './registry.service';
 import { storeModuleConfig } from '../../app.reducer';
+import { FindListOptions } from '../data/request.models';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { RemoteData } from '../data/remote-data';
+import { NoContent } from '../shared/NoContent.model';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -49,211 +41,155 @@ class DummyComponent {
 describe('RegistryService', () => {
   let registryService: RegistryService;
   let mockStore;
-  const pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'registry-service-spec-pagination',
-    pageSize: 20
-  });
+  let metadataSchemaService: MetadataSchemaDataService;
+  let metadataFieldService: MetadataFieldDataService;
 
-  const mockSchemasList = [
-    Object.assign(new MetadataSchema(), {
-      id: 1,
-      _links: {
-        self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' }
-      },
-      prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/',
-      type: MetadataSchema.type
-    }),
-    Object.assign(new MetadataSchema(), {
-      id: 2,
-      _links: {
-        self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' }
-      },
-      prefix: 'mock',
-      namespace: 'http://dspace.org/mockschema',
-      type: MetadataSchema.type
-    })
-  ];
-  const mockFieldsList = [
-    Object.assign(new MetadataField(),
-      {
+  let options: FindListOptions;
+  let mockSchemasList: MetadataSchema[];
+  let mockFieldsList: MetadataField[];
+
+  function init() {
+    options = Object.assign(new FindListOptions(), {
+      currentPage: 1,
+      elementsPerPage: 20
+    });
+
+    mockSchemasList = [
+      Object.assign(new MetadataSchema(), {
         id: 1,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' }
         },
-        element: 'contributor',
-        qualifier: 'advisor',
-        scopeNote: null,
-        schema: mockSchemasList[0],
-        type: MetadataField.type
+        prefix: 'dc',
+        namespace: 'http://dublincore.org/documents/dcmi-terms/',
+        type: MetadataSchema.type
       }),
-    Object.assign(new MetadataField(),
-      {
+      Object.assign(new MetadataSchema(), {
         id: 2,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' }
-        },
-        element: 'contributor',
-        qualifier: 'author',
-        scopeNote: null,
-        schema: mockSchemasList[0],
-        type: MetadataField.type
-      }),
-    Object.assign(new MetadataField(),
-      {
-        id: 3,
-        _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' }
-        },
-        element: 'contributor',
-        qualifier: 'editor',
-        scopeNote: 'test scope note',
-        schema: mockSchemasList[1],
-        type: MetadataField.type
-      }),
-    Object.assign(new MetadataField(),
-      {
-        id: 4,
-        _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' }
         },
-        element: 'contributor',
-        qualifier: 'illustrator',
-        scopeNote: null,
-        schema: mockSchemasList[1],
-        type: MetadataField.type
+        prefix: 'mock',
+        namespace: 'http://dspace.org/mockschema',
+        type: MetadataSchema.type
       })
-  ];
-
-  const pageInfo = new PageInfo();
-  pageInfo.elementsPerPage = 20;
-  pageInfo.currentPage = 1;
-
-  const endpoint = 'path';
-  const endpointWithParams = `${endpoint}?size=${pageInfo.elementsPerPage}&page=${pageInfo.currentPage - 1}`;
-  const fieldEndpointWithParams = `${endpoint}?schema=${mockSchemasList[0].prefix}&size=${pageInfo.elementsPerPage}&page=${pageInfo.currentPage - 1}`;
+    ];
+
+    mockFieldsList = [
+      Object.assign(new MetadataField(),
+        {
+          id: 1,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' }
+          },
+          element: 'contributor',
+          qualifier: 'advisor',
+          scopeNote: null,
+          schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
+          type: MetadataField.type
+        }),
+      Object.assign(new MetadataField(),
+        {
+          id: 2,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' }
+          },
+          element: 'contributor',
+          qualifier: 'author',
+          scopeNote: null,
+          schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
+          type: MetadataField.type
+        }),
+      Object.assign(new MetadataField(),
+        {
+          id: 3,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' }
+          },
+          element: 'contributor',
+          qualifier: 'editor',
+          scopeNote: 'test scope note',
+          schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
+          type: MetadataField.type
+        }),
+      Object.assign(new MetadataField(),
+        {
+          id: 4,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' }
+          },
+          element: 'contributor',
+          qualifier: 'illustrator',
+          scopeNote: null,
+          schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
+          type: MetadataField.type
+        })
+    ];
 
-  const halServiceStub = {
-    getEndpoint: (link: string) => observableOf(endpoint)
-  };
+    metadataSchemaService = jasmine.createSpyObj('metadataSchemaService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(mockSchemasList)),
+      findById: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
+      createOrUpdateMetadataSchema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
+      delete: createNoContentRemoteDataObject$(),
+      clearRequests: observableOf('href')
+    });
 
-  const rdbStub = {
-    toRemoteDataObservable: (requestEntryObs: Observable<RequestEntry>, payloadObs: Observable<any>) => {
-      return observableCombineLatest(requestEntryObs,
-        payloadObs).pipe(map(([req, pay]) => {
-          return { req, pay };
-        })
-      );
-    },
-    aggregate: (input: Array<Observable<RemoteData<any>>>): Observable<RemoteData<any[]>> => {
-      return createSuccessfulRemoteDataObject$([]);
-    }
-  };
+    metadataFieldService = jasmine.createSpyObj('metadataFieldService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(mockFieldsList)),
+      findById: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
+      create: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
+      put: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
+      delete: createNoContentRemoteDataObject$(),
+      clearRequests: observableOf('href')
+    });
+  }
 
   beforeEach(() => {
+    init();
     TestBed.configureTestingModule({
       imports: [CommonModule, StoreModule.forRoot({}, storeModuleConfig), TranslateModule.forRoot()],
       declarations: [
         DummyComponent
       ],
       providers: [
-        { provide: RequestService, useValue: getMockRequestService() },
-        { provide: RemoteDataBuildService, useValue: rdbStub },
-        { provide: HALEndpointService, useValue: halServiceStub },
         { provide: Store, useClass: StoreMock },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: MetadataSchemaDataService, useValue: metadataSchemaService },
+        { provide: MetadataFieldDataService, useValue: metadataFieldService },
         RegistryService
       ]
     });
     registryService = TestBed.get(RegistryService);
     mockStore = TestBed.get(Store);
-    spyOn((registryService as any).halService, 'getEndpoint').and.returnValue(observableOf(endpoint));
   });
 
   describe('when requesting metadataschemas', () => {
-    const queryResponse = Object.assign(new RegistryMetadataschemasResponse(), {
-      metadataschemas: mockSchemasList,
-      page: pageInfo
-    });
-    const response = new RegistryMetadataschemasSuccessResponse(queryResponse, 200, 'OK', pageInfo);
-    const responseEntry = Object.assign(new RequestEntry(), { response: response });
+    let result;
 
     beforeEach(() => {
-      (registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
-      /* tslint:disable:no-empty */
-      registryService.getMetadataSchemas(pagination).subscribe((value) => {
-      });
-      /* tslint:enable:no-empty */
-    });
-
-    it('should call getEndpoint on the halService', () => {
-      expect((registryService as any).halService.getEndpoint).toHaveBeenCalled();
+      result = registryService.getMetadataSchemas(options);
     });
 
-    it('should send out the request on the request service', () => {
-      expect((registryService as any).requestService.configure).toHaveBeenCalled();
-    });
-
-    it('should call getByHref on the request service with the correct request url', () => {
-      expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(endpointWithParams);
+    it('should call metadataSchemaService.findAll', (done) => {
+      result.subscribe(() => {
+        expect(metadataSchemaService.findAll).toHaveBeenCalled();
+        done();
+      });
     });
   });
 
   describe('when requesting metadataschema by name', () => {
-    const queryResponse = Object.assign(new RegistryMetadataschemasResponse(), {
-      metadataschemas: mockSchemasList,
-      page: pageInfo
-    });
-    const response = new RegistryMetadataschemasSuccessResponse(queryResponse, 200, 'OK', pageInfo);
-    const responseEntry = Object.assign(new RequestEntry(), { response: response });
+    let result;
 
     beforeEach(() => {
-      (registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
-      /* tslint:disable:no-empty */
-      registryService.getMetadataSchemaByName(mockSchemasList[0].prefix).subscribe((value) => {
-      });
-      /* tslint:enable:no-empty */
-    });
-
-    it('should call getEndpoint on the halService', () => {
-      expect((registryService as any).halService.getEndpoint).toHaveBeenCalled();
-    });
-
-    it('should send out the request on the request service', () => {
-      expect((registryService as any).requestService.configure).toHaveBeenCalled();
-    });
-
-    it('should call getByHref on the request service with the correct request url', () => {
-      expect((registryService as any).requestService.getByHref.calls.argsFor(0)[0]).toContain(endpoint);
+      result = registryService.getMetadataSchemaByPrefix(mockSchemasList[0].prefix);
     });
-  });
-
-  describe('when requesting metadatafields', () => {
-    const queryResponse = Object.assign(new RegistryMetadatafieldsResponse(), {
-      metadatafields: mockFieldsList,
-      page: pageInfo
-    });
-    const response = new RegistryMetadatafieldsSuccessResponse(queryResponse, 200, 'OK', pageInfo);
-    const responseEntry = Object.assign(new RequestEntry(), { response: response });
 
-    beforeEach(() => {
-      (registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
-      /* tslint:disable:no-empty */
-      registryService.getMetadataFieldsBySchema(mockSchemasList[0], pagination).subscribe((value) => {
+    it('should call metadataSchemaService.findById with the correct ID', (done) => {
+      result.subscribe(() => {
+        expect(metadataSchemaService.findById).toHaveBeenCalledWith(`${mockSchemasList[0].id}`, true);
+        done();
       });
-      /* tslint:enable:no-empty */
-    });
-
-    it('should call getEndpoint on the halService', () => {
-      expect((registryService as any).halService.getEndpoint).toHaveBeenCalled();
-    });
-
-    it('should send out the request on the request service', () => {
-      expect((registryService as any).requestService.configure).toHaveBeenCalled();
-    });
-
-    it('should call getByHref on the request service with the correct request url', () => {
-      expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(fieldEndpointWithParams);
     });
   });
 
@@ -370,51 +306,68 @@ describe('RegistryService', () => {
       result = registryService.createOrUpdateMetadataSchema(mockSchemasList[0]);
     });
 
-    it('should return the created/updated metadata schema', () => {
+    it('should return the created/updated metadata schema', (done) => {
       result.subscribe((schema: MetadataSchema) => {
         expect(schema).toEqual(mockSchemasList[0]);
+        done();
+      });
+    });
+  });
+
+  describe('when createMetadataField is called', () => {
+    let result: Observable<MetadataField>;
+
+    beforeEach(() => {
+      result = registryService.createMetadataField(mockFieldsList[0], mockSchemasList[0]);
+    });
+
+    it('should return the created metadata field', (done) => {
+      result.subscribe((field: MetadataField) => {
+        expect(field).toEqual(mockFieldsList[0]);
+        done();
       });
     });
   });
 
-  describe('when createOrUpdateMetadataField is called', () => {
+  describe('when updateMetadataField is called', () => {
     let result: Observable<MetadataField>;
 
     beforeEach(() => {
-      result = registryService.createOrUpdateMetadataField(mockFieldsList[0]);
+      result = registryService.updateMetadataField(mockFieldsList[0]);
     });
 
-    it('should return the created/updated metadata field', () => {
+    it('should return the updated metadata field', (done) => {
       result.subscribe((field: MetadataField) => {
         expect(field).toEqual(mockFieldsList[0]);
+        done();
       });
     });
   });
 
   describe('when deleteMetadataSchema is called', () => {
-    let result: Observable<RestResponse>;
+    let result: Observable<RemoteData<NoContent>>;
 
     beforeEach(() => {
       result = registryService.deleteMetadataSchema(mockSchemasList[0].id);
     });
 
     it('should return a successful response', () => {
-      result.subscribe((response: RestResponse) => {
-        expect(response.isSuccessful).toBe(true);
+      result.subscribe((response: RemoteData<NoContent>) => {
+        expect(response.hasSucceeded).toBe(true);
       });
     });
   });
 
   describe('when deleteMetadataField is called', () => {
-    let result: Observable<RestResponse>;
+    let result: Observable<RemoteData<NoContent>>;
 
     beforeEach(() => {
       result = registryService.deleteMetadataField(mockFieldsList[0].id);
     });
 
     it('should return a successful response', () => {
-      result.subscribe((response: RestResponse) => {
-        expect(response.isSuccessful).toBe(true);
+      result.subscribe((response: RemoteData<NoContent>) => {
+        expect(response.hasSucceeded).toBe(true);
       });
     });
   });
@@ -425,7 +378,7 @@ describe('RegistryService', () => {
     });
 
     it('should remove the requests related to metadata schemas from cache', () => {
-      expect((registryService as any).requestService.removeByHrefSubstring).toHaveBeenCalled();
+      expect(metadataSchemaService.clearRequests).toHaveBeenCalled();
     });
   });
 
@@ -435,7 +388,7 @@ describe('RegistryService', () => {
     });
 
     it('should remove the requests related to metadata fields from cache', () => {
-      expect((registryService as any).requestService.removeByHrefSubstring).toHaveBeenCalled();
+      expect(metadataFieldService.clearRequests).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index fbc42b26f4a..6f67db80191 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -1,38 +1,10 @@
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { PageInfo } from '../shared/page-info.model';
-import {
-  CreateMetadataFieldRequest,
-  CreateMetadataSchemaRequest,
-  DeleteRequest,
-  GetRequest,
-  RestRequest,
-  UpdateMetadataFieldRequest,
-  UpdateMetadataSchemaRequest
-} from '../data/request.models';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from '../data/parsing.service';
-import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RequestService } from '../data/request.service';
-import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
-import {
-  MetadatafieldSuccessResponse,
-  MetadataschemaSuccessResponse,
-  RegistryMetadatafieldsSuccessResponse,
-  RegistryMetadataschemasSuccessResponse,
-  RestResponse
-} from '../cache/response.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
-import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { configureRequest, getResponseFromEntry } from '../shared/operators';
+import { PaginatedList } from '../data/paginated-list.model';
+import { FindListOptions } from '../data/request.models';
+import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/empty.util';
+import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
 import { createSelector, select, Store } from '@ngrx/store';
 import { AppState } from '../../app.reducer';
 import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers';
@@ -48,15 +20,16 @@ import {
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
 } from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { distinctUntilChanged, flatMap, map, take, tap } from 'rxjs/operators';
+import { flatMap, map, tap } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { HttpHeaders } from '@angular/common/http';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { MetadataField } from '../metadata/metadata-field.model';
-import { getClassForType } from '../cache/builders/build-decorators';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RequestParam } from '../cache/models/request-param.model';
+import { NoContent } from '../shared/NoContent.model';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -70,221 +43,56 @@ const selectedMetadataFieldsSelector = createSelector(metadataRegistryStateSelec
 @Injectable()
 export class RegistryService {
 
-  private metadataSchemasPath = 'metadataschemas';
-  private metadataFieldsPath = 'metadatafields';
-
-  // private bitstreamFormatsPath = 'bitstreamformats';
-
-  constructor(protected requestService: RequestService,
-              private rdb: RemoteDataBuildService,
-              private halService: HALEndpointService,
-              private store: Store<AppState>,
+  constructor(private store: Store<AppState>,
               private notificationsService: NotificationsService,
-              private translateService: TranslateService) {
+              private translateService: TranslateService,
+              private metadataSchemaService: MetadataSchemaDataService,
+              private metadataFieldService: MetadataFieldDataService) {
 
   }
 
   /**
    * Retrieves all metadata schemas
-   * @param pagination The pagination info used to retrieve the schemas
+   * @param options           The options used to retrieve the schemas
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public getMetadataSchemas(pagination: PaginationComponentOptions): Observable<RemoteData<PaginatedList<MetadataSchema>>> {
-    const requestObs = this.getMetadataSchemasRequestObs(pagination);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    const rmrObs: Observable<RegistryMetadataschemasResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadataschemasSuccessResponse) => response.metadataschemasResponse)
-    );
-
-    const metadataschemasObs: Observable<MetadataSchema[]> = rmrObs.pipe(
-      map((rmr: RegistryMetadataschemasResponse) => rmr.metadataschemas)
-    );
-
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadataschemasSuccessResponse) => response.pageInfo)
-    );
-
-    const payloadObs = observableCombineLatest(metadataschemasObs, pageInfoObs).pipe(
-      map(([metadataschemas, pageInfo]) => {
-        return new PaginatedList(pageInfo, metadataschemas);
-      })
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
+  public getMetadataSchemas(options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<MetadataSchema>>): Observable<RemoteData<PaginatedList<MetadataSchema>>> {
+    return this.metadataSchemaService.findAll(options, reRequestOnStale, ...linksToFollow);
   }
 
   /**
-   * Retrieves a metadata schema by its name
-   * @param schemaName The name of the schema to find
+   * Retrieves a metadata schema by its prefix
+   * @param prefix The prefux of the schema to find
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public getMetadataSchemaByName(schemaName: string): Observable<RemoteData<MetadataSchema>> {
-    // Temporary pagination to get ALL metadataschemas until there's a rest api endpoint for fetching a specific schema
-    const pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-      id: 'all-metadatafields-pagination',
-      pageSize: 10000
+  public getMetadataSchemaByPrefix(prefix: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<MetadataSchema>>): Observable<RemoteData<MetadataSchema>> {
+    // Temporary options to get ALL metadataschemas until there's a rest api endpoint for fetching a specific schema
+    const options: FindListOptions = Object.assign(new FindListOptions(), {
+      elementsPerPage: 10000
     });
-    const requestObs = this.getMetadataSchemasRequestObs(pagination);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    const rmrObs: Observable<RegistryMetadataschemasResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadataschemasSuccessResponse) => response.metadataschemasResponse)
-    );
-
-    const metadataschemaObs: Observable<MetadataSchema> = rmrObs.pipe(
-      map((rmr: RegistryMetadataschemasResponse) => rmr.metadataschemas),
-      map((metadataSchemas: MetadataSchema[]) => metadataSchemas.filter((value) => value.prefix === schemaName)[0])
+    return this.getMetadataSchemas(options).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((schemas: PaginatedList<MetadataSchema>) => schemas.page),
+      isNotEmptyOperator(),
+      map((schemas: MetadataSchema[]) => schemas.filter((schema) => schema.prefix === prefix)[0]),
+      flatMap((schema: MetadataSchema) => this.metadataSchemaService.findById(`${schema.id}`, reRequestOnStale, ...linksToFollow))
     );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, metadataschemaObs);
   }
 
   /**
    * retrieves all metadata fields that belong to a certain metadata schema
-   * @param schema The schema to filter by
-   * @param pagination The pagination info used to retrieve the fields
+   * @param schema            The schema to filter by
+   * @param options           The options info used to retrieve the fields
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public getMetadataFieldsBySchema(schema: MetadataSchema, pagination: PaginationComponentOptions): Observable<RemoteData<PaginatedList<MetadataField>>> {
-    const requestObs = this.getMetadataFieldsBySchemaRequestObs(pagination, schema);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    const rmrObs: Observable<RegistryMetadatafieldsResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.metadatafieldsResponse)
-    );
-
-    const metadatafieldsObs: Observable<MetadataField[]> = rmrObs.pipe(
-      map((rmr: RegistryMetadatafieldsResponse) => rmr.metadatafields)
-    );
-
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.pageInfo)
-    );
-
-    const payloadObs = observableCombineLatest(metadatafieldsObs, pageInfoObs).pipe(
-      map(([metadatafields, pageInfo]) => {
-        return new PaginatedList(pageInfo, metadatafields);
-      })
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
-  }
-
-  /**
-   * Retrieve all existing metadata fields as a paginated list
-   * @param pagination Pagination options to determine which page of metadata fields should be requested
-   * When no pagination is provided, all metadata fields are requested in one large page
-   * @returns an observable that emits a remote data object with a page of metadata fields
-   */
-  public getAllMetadataFields(pagination?: PaginationComponentOptions): Observable<RemoteData<PaginatedList<MetadataField>>> {
-    if (hasNoValue(pagination)) {
-      pagination = {currentPage: 1, pageSize: 10000} as any;
-    }
-    const requestObs = this.getMetadataFieldsRequestObs(pagination);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    const rmrObs: Observable<RegistryMetadatafieldsResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.metadatafieldsResponse)
-    );
-
-    const metadatafieldsObs: Observable<MetadataField[]> = rmrObs.pipe(
-      map((rmr: RegistryMetadatafieldsResponse) => rmr.metadatafields),
-      /* Make sure to explicitly cast this into a MetadataField object, on first page loads this object comes from the object cache created by the server and its prototype is unknown */
-      map((metadataFields: MetadataField[]) => metadataFields.map((metadataField: MetadataField) => Object.assign(new MetadataField(), metadataField)))
-    );
-
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.pageInfo)
-    );
-
-    const payloadObs = observableCombineLatest(metadatafieldsObs, pageInfoObs).pipe(
-      map(([metadatafields, pageInfo]) => {
-        return new PaginatedList(pageInfo, metadatafields);
-      })
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
-  }
-
-  public getMetadataSchemasRequestObs(pagination: PaginationComponentOptions): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-      map((url: string) => {
-        const args: string[] = [];
-        args.push(`size=${pagination.pageSize}`);
-        args.push(`page=${pagination.currentPage - 1}`);
-        if (isNotEmpty(args)) {
-          url = new URLCombiner(url, `?${args.join('&')}`).toString();
-        }
-        const request = new GetRequest(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
-          getResponseParser(): GenericConstructor<ResponseParsingService> {
-            return RegistryMetadataschemasResponseParsingService;
-          }
-        });
-      }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-    );
-  }
-
-  private getMetadataFieldsBySchemaRequestObs(pagination: PaginationComponentOptions, schema: MetadataSchema): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataFieldsPath + '/search/bySchema').pipe(
-      // return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      map((url: string) => {
-        const args: string[] = [];
-        args.push(`schema=${schema.prefix}`);
-        args.push(`size=${pagination.pageSize}`);
-        args.push(`page=${pagination.currentPage - 1}`);
-        if (isNotEmpty(args)) {
-          url = new URLCombiner(url, `?${args.join('&')}`).toString();
-        }
-        const request = new GetRequest(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
-          getResponseParser(): GenericConstructor<ResponseParsingService> {
-            return RegistryMetadatafieldsResponseParsingService;
-          }
-        });
-      }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-    );
-  }
-
-  private getMetadataFieldsRequestObs(pagination: PaginationComponentOptions): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      map((url: string) => {
-        const args: string[] = [];
-        args.push(`size=${pagination.pageSize}`);
-        args.push(`page=${pagination.currentPage - 1}`);
-        if (isNotEmpty(args)) {
-          url = new URLCombiner(url, `?${args.join('&')}`).toString();
-        }
-        const request = new GetRequest(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
-          getResponseParser(): GenericConstructor<ResponseParsingService> {
-            return RegistryMetadatafieldsResponseParsingService;
-          }
-        });
-      }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-    );
+  public getMetadataFieldsBySchema(schema: MetadataSchema, options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<MetadataField>>): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return this.metadataFieldService.findBySchema(schema, options, reRequestOnStale, ...linksToFollow);
   }
 
   public editMetadataSchema(schema: MetadataSchema) {
@@ -334,6 +142,7 @@ export class RegistryService {
   public getSelectedMetadataSchemas(): Observable<MetadataSchema[]> {
     return this.store.pipe(select(selectedMetadataSchemasSelector));
   }
+
   /**
    * Method to start editing a metadata field, dispatches an edit field action
    * @param field The field that's being edited
@@ -348,12 +157,14 @@ export class RegistryService {
   public cancelEditMetadataField() {
     this.store.dispatch(new MetadataRegistryCancelFieldAction());
   }
+
   /**
    * Method to retrieve the metadata field that are currently being edited
    */
   public getActiveMetadataField(): Observable<MetadataField> {
     return this.store.pipe(select(editMetadataFieldSelector));
   }
+
   /**
    * Method to select a metadata field, dispatches a select field action
    * @param field The field that's being selected
@@ -361,6 +172,7 @@ export class RegistryService {
   public selectMetadataField(field: MetadataField) {
     this.store.dispatch(new MetadataRegistrySelectFieldAction(field));
   }
+
   /**
    * Method to deselect a metadata field, dispatches a deselect field action
    * @param field The field that's it being deselected
@@ -368,6 +180,7 @@ export class RegistryService {
   public deselectMetadataField(field: MetadataField) {
     this.store.dispatch(new MetadataRegistryDeselectFieldAction(field));
   }
+
   /**
    * Method to deselect all currently selected metadata fields, dispatches a deselect all field action
    */
@@ -386,59 +199,17 @@ export class RegistryService {
    * Create or Update a MetadataSchema
    *  If the MetadataSchema contains an id, it is assumed the schema already exists and is updated instead
    *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
-   *  - On creation, a CreateMetadataSchemaRequest is used
-   *  - On update, a UpdateMetadataSchemaRequest is used
+   *  - On creation, a CreateRequest is used
+   *  - On update, a PutRequest is used
    * @param schema    The MetadataSchema to create or update
    */
   public createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
     const isUpdate = hasValue(schema.id);
-    const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-      isNotEmptyOperator(),
-      map((endpoint: string) => (isUpdate ? `${endpoint}/${schema.id}` : endpoint)),
-      distinctUntilChanged()
-    );
-
-    const serializedSchema = new DSpaceSerializer(getClassForType(MetadataSchema.type)).serialize(schema);
-
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => {
-        if (isUpdate) {
-          const options: HttpOptions = Object.create({});
-          let headers = new HttpHeaders();
-          headers = headers.append('Content-Type', 'application/json');
-          options.headers = headers;
-          return new UpdateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema), options);
-        } else {
-          return new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema));
-        }
-      })
-    );
-
-    // Execute the post/put request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
-
-    // Return created/updated schema
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        if (!response.isSuccessful) {
-          if (hasValue((response as any).errorMessage)) {
-            this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
-          }
-        } else {
-          this.showNotifications(true, isUpdate, false, {prefix: schema.prefix});
-          return response;
-        }
-      }),
-      isNotEmptyOperator(),
-      map((response: MetadataschemaSuccessResponse) => {
-        if (isNotEmpty(response.metadataschema)) {
-          return response.metadataschema;
-        }
+    return this.metadataSchemaService.createOrUpdateMetadataSchema(schema).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      hasValueOperator(),
+      tap(() => {
+        this.showNotifications(true, isUpdate, false, { prefix: schema.prefix });
       })
     );
   }
@@ -447,75 +218,44 @@ export class RegistryService {
    * Method to delete a metadata schema
    * @param id The id of the metadata schema to delete
    */
-  public deleteMetadataSchema(id: number): Observable<RestResponse> {
-    return this.delete(this.metadataSchemasPath, id);
+  public deleteMetadataSchema(id: number): Observable<RemoteData<NoContent>> {
+    return this.metadataSchemaService.delete(`${id}`);
   }
 
   /**
    * Method that clears a cached metadata schema request and returns its REST url
    */
   public clearMetadataSchemaRequests(): Observable<string> {
-    return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
-    );
+    return this.metadataSchemaService.clearRequests();
   }
 
   /**
-   * Create or Update a MetadataField
-   *  If the MetadataField contains an id, it is assumed the field already exists and is updated instead
-   *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
-   *  - On creation, a CreateMetadataFieldRequest is used
-   *  - On update, a UpdateMetadataFieldRequest is used
-   * @param field    The MetadataField to create or update
+   * Create a MetadataField
+   *
+   * @param field    The MetadataField to create
+   * @param schema   The MetadataSchema to create the field in
    */
-  public createOrUpdateMetadataField(field: MetadataField): Observable<MetadataField> {
-    const isUpdate = hasValue(field.id);
-    const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      isNotEmptyOperator(),
-      map((endpoint: string) => (isUpdate ? `${endpoint}/${field.id}` : `${endpoint}?schemaId=${field.schema.id}`)),
-      distinctUntilChanged()
-    );
-
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => {
-        if (isUpdate) {
-          const options: HttpOptions = Object.create({});
-          let headers = new HttpHeaders();
-          headers = headers.append('Content-Type', 'application/json');
-          options.headers = headers;
-          return new UpdateMetadataFieldRequest(requestId, endpoint, JSON.stringify(field), options);
-        } else {
-          return new CreateMetadataFieldRequest(requestId, endpoint, JSON.stringify(field));
-        }
+  public createMetadataField(field: MetadataField, schema: MetadataSchema): Observable<MetadataField> {
+    return this.metadataFieldService.create(field, new RequestParam('schemaId', schema.id)).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      hasValueOperator(),
+      tap(() => {
+        this.showNotifications(true, false, true, { field: field.toString() });
       })
     );
+  }
 
-    // Execute the post/put request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
-
-    // Return created/updated field
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        if (!response.isSuccessful) {
-          if (hasValue((response as any).errorMessage)) {
-            this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
-          }
-        } else {
-          const fieldString = `${field.schema.prefix}.${field.element}${field.qualifier ? `.${field.qualifier}` : ''}`;
-          this.showNotifications(true, isUpdate, true, {field: fieldString});
-          return response;
-        }
-      }),
-      isNotEmptyOperator(),
-      map((response: MetadatafieldSuccessResponse) => {
-        if (isNotEmpty(response.metadatafield)) {
-          return response.metadatafield;
-        }
+  /**
+   * Update a MetadataField
+   *
+   * @param field    The MetadataField to update
+   */
+  public updateMetadataField(field: MetadataField): Observable<MetadataField> {
+    return this.metadataFieldService.put(field).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      hasValueOperator(),
+      tap(() => {
+        this.showNotifications(true, true, true, { field: field.toString() });
       })
     );
   }
@@ -524,39 +264,15 @@ export class RegistryService {
    * Method to delete a metadata field
    * @param id The id of the metadata field to delete
    */
-  public deleteMetadataField(id: number): Observable<RestResponse> {
-    return this.delete(this.metadataFieldsPath, id);
+  public deleteMetadataField(id: number): Observable<RemoteData<NoContent>> {
+    return this.metadataFieldService.delete(`${id}`);
   }
+
   /**
    * Method that clears a cached metadata field request and returns its REST url
    */
   public clearMetadataFieldRequests(): Observable<string> {
-    return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
-    );
-  }
-
-  private delete(path: string, id: number): Observable<RestResponse> {
-    const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(path).pipe(
-      isNotEmptyOperator(),
-      map((endpoint: string) => `${endpoint}/${id}`),
-      distinctUntilChanged()
-    );
-
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => new DeleteRequest(requestId, endpoint))
-    );
-
-    // Execute the delete request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
-
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry()
-    );
+    return this.metadataFieldService.clearRequests();
   }
 
   private showNotifications(success: boolean, edited: boolean, isField: boolean, options: any) {
@@ -578,18 +294,16 @@ export class RegistryService {
 
   /**
    * Retrieve a filtered paginated list of metadata fields
-   * @param query {string} The query to filter the field names by
+   * @param query {string}    The query to use for the metadata field name, can be part of the fully
+   *                          qualified field, should start with the start of the schema, element or
+   *                          qualifier (e.g. “dc.ti”, “contributor”, “auth”, “contributor.ot”)
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                          should be automatically resolved
    * @returns an observable that emits a remote data object with a page of metadata fields that match the query
    */
-  queryMetadataFields(query: string): Observable<RemoteData<PaginatedList<MetadataField>>> {
-    return this.getAllMetadataFields().pipe(
-      map((rd: RemoteData<PaginatedList<MetadataField>>) => {
-        const filteredFields: MetadataField[] = rd.payload.page.filter(
-          (field: MetadataField) => field.toString().indexOf(query) >= 0
-        );
-        const page: PaginatedList<MetadataField> = new PaginatedList<MetadataField>(new PageInfo(), filteredFields)
-        return Object.assign({}, rd, { payload: page });
-      })
-    );
+  queryMetadataFields(query: string, options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<MetadataField>>): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return this.metadataFieldService.searchByFieldNameParams(null, null, null, query, null, options, reRequestOnStale, ...linksToFollow);
   }
 }
diff --git a/src/app/core/reload/reload.guard.spec.ts b/src/app/core/reload/reload.guard.spec.ts
new file mode 100644
index 00000000000..317245bafa9
--- /dev/null
+++ b/src/app/core/reload/reload.guard.spec.ts
@@ -0,0 +1,47 @@
+import { ReloadGuard } from './reload.guard';
+import { Router } from '@angular/router';
+
+describe('ReloadGuard', () => {
+  let guard: ReloadGuard;
+  let router: Router;
+
+  beforeEach(() => {
+    router = jasmine.createSpyObj('router', ['parseUrl', 'createUrlTree']);
+    guard = new ReloadGuard(router);
+  });
+
+  describe('canActivate', () => {
+    let route;
+
+    describe('when the route\'s query params contain a redirect url', () => {
+      let redirectUrl;
+
+      beforeEach(() => {
+        redirectUrl = '/redirect/url?param=extra';
+        route = {
+          queryParams: {
+            redirect: redirectUrl
+          }
+        };
+      });
+
+      it('should create a UrlTree with the redirect URL', () => {
+        guard.canActivate(route, undefined);
+        expect(router.parseUrl).toHaveBeenCalledWith(redirectUrl);
+      });
+    });
+
+    describe('when the route\'s query params doesn\'t contain a redirect url', () => {
+      beforeEach(() => {
+        route = {
+          queryParams: {}
+        };
+      });
+
+      it('should create a UrlTree to home', () => {
+        guard.canActivate(route, undefined);
+        expect(router.createUrlTree).toHaveBeenCalledWith(['home']);
+      });
+    });
+  });
+});
diff --git a/src/app/core/reload/reload.guard.ts b/src/app/core/reload/reload.guard.ts
new file mode 100644
index 00000000000..78f9dcf642b
--- /dev/null
+++ b/src/app/core/reload/reload.guard.ts
@@ -0,0 +1,26 @@
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Injectable } from '@angular/core';
+import { isNotEmpty } from '../../shared/empty.util';
+
+/**
+ * A guard redirecting the user to the URL provided in the route's query params
+ * When no redirect url is found, the user is redirected to the homepage
+ */
+@Injectable()
+export class ReloadGuard implements CanActivate {
+  constructor(private router: Router) {
+  }
+
+  /**
+   * Get the UrlTree of the URL to redirect to
+   * @param route
+   * @param state
+   */
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): UrlTree {
+    if (isNotEmpty(route.queryParams.redirect)) {
+      return this.router.parseUrl(route.queryParams.redirect);
+    } else {
+      return this.router.createUrlTree(['home']);
+    }
+  }
+}
diff --git a/src/app/core/cache/models/action-type.model.ts b/src/app/core/resource-policy/models/action-type.model.ts
similarity index 75%
rename from src/app/core/cache/models/action-type.model.ts
rename to src/app/core/resource-policy/models/action-type.model.ts
index 4965f93e893..93c69c37052 100644
--- a/src/app/core/cache/models/action-type.model.ts
+++ b/src/app/core/resource-policy/models/action-type.model.ts
@@ -5,27 +5,27 @@ export enum ActionType {
   /**
    * Action of reading, viewing or downloading something
    */
-  READ = 0,
+  READ = 'READ',
 
   /**
    * Action of modifying something
    */
-  WRITE = 1,
+  WRITE = 'WRITE',
 
   /**
    * Action of deleting something
    */
-  DELETE = 2,
+  DELETE = 'DELETE',
 
   /**
    * Action of adding something to a container
    */
-  ADD = 3,
+  ADD = 'ADD',
 
   /**
    * Action of removing something from a container
    */
-  REMOVE = 4,
+  REMOVE = 'REMOVE',
 
   /**
    * Action of performing workflow step 1
@@ -50,15 +50,20 @@ export enum ActionType {
   /**
    * Default Read policies for Bitstreams submitted to container
    */
-  DEFAULT_BITSTREAM_READ = 9,
+  DEFAULT_BITSTREAM_READ = 'DEFAULT_BITSTREAM_READ',
 
   /**
    *  Default Read policies for Items submitted to container
    */
-  DEFAULT_ITEM_READ = 10,
+  DEFAULT_ITEM_READ = 'DEFAULT_ITEM_READ',
 
   /**
    * Administrative actions
    */
-  ADMIN = 11,
+  ADMIN = 'ADMIN',
+
+  /**
+   * Action of withdrawn reading
+   */
+  WITHDRAWN_READ = 'WITHDRAWN_READ'
 }
diff --git a/src/app/core/resource-policy/models/policy-type.model.ts b/src/app/core/resource-policy/models/policy-type.model.ts
new file mode 100644
index 00000000000..21193e5ce50
--- /dev/null
+++ b/src/app/core/resource-policy/models/policy-type.model.ts
@@ -0,0 +1,25 @@
+/**
+ * Enum representing the Policy Type of a Resource Policy
+ */
+export enum PolicyType {
+  /**
+   * A policy in place during the submission
+   */
+  TYPE_SUBMISSION = 'TYPE_SUBMISSION',
+
+  /**
+   * A policy in place during the approval workflow
+   */
+  TYPE_WORKFLOW = 'TYPE_WORKFLOW',
+
+  /**
+   * A policy that has been inherited from a container (the collection)
+   */
+  TYPE_INHERITED = 'TYPE_INHERITED',
+
+  /**
+   * A policy defined by the user during the submission or workflow phase
+   */
+  TYPE_CUSTOM = 'TYPE_CUSTOM',
+
+}
diff --git a/src/app/core/resource-policy/models/resource-policy.model.ts b/src/app/core/resource-policy/models/resource-policy.model.ts
new file mode 100644
index 00000000000..27602557d6d
--- /dev/null
+++ b/src/app/core/resource-policy/models/resource-policy.model.ts
@@ -0,0 +1,105 @@
+import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import { link, typedObject } from '../../cache/builders/build-decorators';
+import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { ActionType } from './action-type.model';
+import { CacheableObject } from '../../cache/object-cache.reducer';
+import { HALLink } from '../../shared/hal-link.model';
+import { RESOURCE_POLICY } from './resource-policy.resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ResourceType } from '../../shared/resource-type';
+import { PolicyType } from './policy-type.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../data/remote-data';
+import { GROUP } from '../../eperson/models/group.resource-type';
+import { Group } from '../../eperson/models/group.model';
+import { EPERSON } from '../../eperson/models/eperson.resource-type';
+import { EPerson } from '../../eperson/models/eperson.model';
+
+/**
+ * Model class for a Resource Policy
+ */
+@typedObject
+export class ResourcePolicy implements CacheableObject {
+  static type = RESOURCE_POLICY;
+
+  /**
+   * The identifier for this Resource Policy
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * The name for this Resource Policy
+   */
+  @autoserialize
+  name: string;
+
+  /**
+   * The description for this Resource Policy
+   */
+  @autoserialize
+  description: string;
+
+  /**
+   * The classification or this Resource Policy
+   */
+  @autoserialize
+  policyType: PolicyType;
+
+  /**
+   * The action that is allowed by this Resource Policy
+   */
+  @autoserialize
+  action: ActionType;
+
+  /**
+   * The first day of validity of the policy (format YYYY-MM-DD)
+   */
+  @autoserialize
+  startDate: string;
+
+  /**
+   * The last day of validity of the policy (format YYYY-MM-DD)
+   */
+  @autoserialize
+  endDate: string;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The universally unique identifier for this Resource Policy
+   * This UUID is generated client-side and isn't used by the backend.
+   * It is based on the ID, so it will be the same for each refresh.
+   */
+  @deserializeAs(new IDToUUIDSerializer('resource-policy'), 'id')
+  uuid: string;
+
+  /**
+   * The {@link HALLink}s for this ResourcePolicy
+   */
+  @deserialize
+  _links: {
+    eperson: HALLink,
+    group: HALLink,
+    self: HALLink,
+  };
+
+  /**
+   * The eperson linked by this resource policy
+   * Will be undefined unless the version {@link HALLink} has been resolved.
+   */
+  @link(EPERSON)
+  eperson?: Observable<RemoteData<EPerson>>;
+
+  /**
+   * The group linked by this resource policy
+   * Will be undefined unless the version {@link HALLink} has been resolved.
+   */
+  @link(GROUP)
+  group?: Observable<RemoteData<Group>>;
+}
diff --git a/src/app/core/resource-policy/models/resource-policy.resource-type.ts b/src/app/core/resource-policy/models/resource-policy.resource-type.ts
new file mode 100644
index 00000000000..d8ff3b94856
--- /dev/null
+++ b/src/app/core/resource-policy/models/resource-policy.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for ResourcePolicy
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const RESOURCE_POLICY = new ResourceType('resourcepolicy');
diff --git a/src/app/core/resource-policy/resource-policy.service.spec.ts b/src/app/core/resource-policy/resource-policy.service.spec.ts
new file mode 100644
index 00000000000..b73183c7551
--- /dev/null
+++ b/src/app/core/resource-policy/resource-policy.service.spec.ts
@@ -0,0 +1,323 @@
+import { HttpClient } from '@angular/common/http';
+
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { RequestService } from '../data/request.service';
+import { ResourcePolicyService } from './resource-policy.service';
+import { PolicyType } from './models/policy-type.model';
+import { ActionType } from './models/action-type.model';
+import { FindListOptions } from '../data/request.models';
+import { RequestParam } from '../cache/models/request-param.model';
+import { PageInfo } from '../shared/page-info.model';
+import { PaginatedList, buildPaginatedList } from '../data/paginated-list.model';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RequestEntry } from '../data/request.reducer';
+import { RestResponse } from '../cache/response.models';
+
+describe('ResourcePolicyService', () => {
+  let scheduler: TestScheduler;
+  let service: ResourcePolicyService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let responseCacheEntry: RequestEntry;
+
+  const resourcePolicy: any = {
+    id: '1',
+    name: null,
+    description: null,
+    policyType: PolicyType.TYPE_SUBMISSION,
+    action: ActionType.READ,
+    startDate: null,
+    endDate: null,
+    type: 'resourcepolicy',
+    uuid: 'resource-policy-1',
+    _links: {
+      eperson: {
+        href: 'https://rest.api/rest/api/eperson'
+      },
+      group: {
+        href: 'https://rest.api/rest/api/group'
+      },
+      self: {
+        href: 'https://rest.api/rest/api/resourcepolicies/1'
+      },
+    }
+  };
+
+  const anotherResourcePolicy: any = {
+    id: '2',
+    name: null,
+    description: null,
+    policyType: PolicyType.TYPE_SUBMISSION,
+    action: ActionType.WRITE,
+    startDate: null,
+    endDate: null,
+    type: 'resourcepolicy',
+    uuid: 'resource-policy-2',
+    _links: {
+      eperson: {
+        href: 'https://rest.api/rest/api/eperson'
+      },
+      group: {
+        href: 'https://rest.api/rest/api/group'
+      },
+      self: {
+        href: 'https://rest.api/rest/api/resourcepolicies/1'
+      },
+    }
+  };
+  const endpointURL = `https://rest.api/rest/api/resourcepolicies`;
+  const requestURL = `https://rest.api/rest/api/resourcepolicies/${resourcePolicy.id}`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const resourcePolicyId = '1';
+  const epersonUUID = '8b39g7ya-5a4b-438b-9686-be1d5b4a1c5a';
+  const groupUUID = '8b39g7ya-5a4b-36987-9686-be1d5b4a1c5a';
+  const resourceUUID = '8b39g7ya-5a4b-438b-851f-be1d5b4a1c5a';
+
+  const pageInfo = new PageInfo();
+  const array = [resourcePolicy, anotherResourcePolicy];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const resourcePolicyRD = createSuccessfulRemoteDataObject(resourcePolicy);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', { a: endpointURL })
+    });
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      configure: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: hot('a|', {
+        a: resourcePolicyRD
+      }),
+      buildList: hot('a|', {
+        a: paginatedListRD
+      }),
+      buildFromRequestUUID: hot('a|', {
+        a: resourcePolicyRD
+      })
+    });
+    objectCache = {} as ObjectCacheService;
+    const notificationsService = {} as NotificationsService;
+    const http = {} as HttpClient;
+    const comparator = {} as any;
+
+    service = new ResourcePolicyService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator
+    );
+
+    spyOn((service as any).dataService, 'create').and.callThrough();
+    spyOn((service as any).dataService, 'delete').and.callThrough();
+    spyOn((service as any).dataService, 'update').and.callThrough();
+    spyOn((service as any).dataService, 'findById').and.callThrough();
+    spyOn((service as any).dataService, 'findByHref').and.callThrough();
+    spyOn((service as any).dataService, 'searchBy').and.callThrough();
+    spyOn((service as any).dataService, 'getSearchByHref').and.returnValue(observableOf(requestURL));
+  });
+
+  describe('create', () => {
+    it('should proxy the call to dataservice.create with eperson UUID', () => {
+      scheduler.schedule(() => service.create(resourcePolicy, resourceUUID, epersonUUID));
+      const params = [
+        new RequestParam('resource', resourceUUID),
+        new RequestParam('eperson', epersonUUID)
+      ];
+      scheduler.flush();
+
+      expect((service as any).dataService.create).toHaveBeenCalledWith(resourcePolicy, ...params);
+    });
+
+    it('should proxy the call to dataservice.create with group UUID', () => {
+      scheduler.schedule(() => service.create(resourcePolicy, resourceUUID, null, groupUUID));
+      const params = [
+        new RequestParam('resource', resourceUUID),
+        new RequestParam('group', groupUUID)
+      ];
+      scheduler.flush();
+
+      expect((service as any).dataService.create).toHaveBeenCalledWith(resourcePolicy, ...params);
+    });
+
+    it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
+      const result = service.create(resourcePolicy, resourceUUID, epersonUUID);
+      const expected = cold('a|', {
+        a: resourcePolicyRD
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('delete', () => {
+    it('should proxy the call to dataservice.create', () => {
+      scheduler.schedule(() => service.delete(resourcePolicyId));
+      scheduler.flush();
+
+      expect((service as any).dataService.delete).toHaveBeenCalledWith(resourcePolicyId);
+    });
+  });
+
+  describe('update', () => {
+    it('should proxy the call to dataservice.update', () => {
+      scheduler.schedule(() => service.update(resourcePolicy));
+      scheduler.flush();
+
+      expect((service as any).dataService.update).toHaveBeenCalledWith(resourcePolicy);
+    });
+  });
+
+  describe('findById', () => {
+    it('should proxy the call to dataservice.findById', () => {
+      scheduler.schedule(() => service.findById(resourcePolicyId));
+      scheduler.flush();
+
+      expect((service as any).dataService.findById).toHaveBeenCalledWith(resourcePolicyId, true);
+    });
+
+    it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
+      const result = service.findById(resourcePolicyId);
+      const expected = cold('a|', {
+        a: resourcePolicyRD
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('findByHref', () => {
+    it('should proxy the call to dataservice.findByHref', () => {
+      scheduler.schedule(() => service.findByHref(requestURL));
+      scheduler.flush();
+
+      expect((service as any).dataService.findByHref).toHaveBeenCalledWith(requestURL, true);
+    });
+
+    it('should return a RemoteData<ResourcePolicy> for the object with the given URL', () => {
+      const result = service.findByHref(requestURL);
+      const expected = cold('a|', {
+        a: resourcePolicyRD
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('searchByEPerson', () => {
+    it('should proxy the call to dataservice.searchBy', () => {
+      const options = new FindListOptions();
+      options.searchParams = [new RequestParam('uuid', epersonUUID)];
+      scheduler.schedule(() => service.searchByEPerson(epersonUUID));
+      scheduler.flush();
+
+      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByEPersonMethod, options, true);
+    });
+
+    it('should proxy the call to dataservice.searchBy with additional search param', () => {
+      const options = new FindListOptions();
+      options.searchParams = [
+        new RequestParam('uuid', epersonUUID),
+        new RequestParam('resource', resourceUUID),
+      ];
+      scheduler.schedule(() => service.searchByEPerson(epersonUUID, resourceUUID));
+      scheduler.flush();
+
+      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByEPersonMethod, options, true);
+    });
+
+    it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
+      const result = service.searchByEPerson(epersonUUID, resourceUUID);
+      const expected = cold('a|', {
+        a: paginatedListRD
+      });
+      expect(result).toBeObservable(expected);
+    });
+
+  });
+
+  describe('searchByGroup', () => {
+    it('should proxy the call to dataservice.searchBy', () => {
+      const options = new FindListOptions();
+      options.searchParams = [new RequestParam('uuid', groupUUID)];
+      scheduler.schedule(() => service.searchByGroup(groupUUID));
+      scheduler.flush();
+
+      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true);
+    });
+
+    it('should proxy the call to dataservice.searchBy with additional search param', () => {
+      const options = new FindListOptions();
+      options.searchParams = [
+        new RequestParam('uuid', groupUUID),
+        new RequestParam('resource', resourceUUID),
+      ];
+      scheduler.schedule(() => service.searchByGroup(groupUUID, resourceUUID));
+      scheduler.flush();
+
+      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true);
+    });
+
+    it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
+      const result = service.searchByGroup(groupUUID);
+      const expected = cold('a|', {
+        a: paginatedListRD
+      });
+      expect(result).toBeObservable(expected);
+    });
+
+  });
+
+  describe('searchByResource', () => {
+    it('should proxy the call to dataservice.searchBy', () => {
+      const options = new FindListOptions();
+      options.searchParams = [new RequestParam('uuid', resourceUUID)];
+      scheduler.schedule(() => service.searchByResource(resourceUUID));
+      scheduler.flush();
+
+      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByResourceMethod, options, true);
+    });
+
+    it('should proxy the call to dataservice.searchBy with additional search param', () => {
+      const action = ActionType.READ;
+      const options = new FindListOptions();
+      options.searchParams = [
+        new RequestParam('uuid', resourceUUID),
+        new RequestParam('action', action),
+      ];
+      scheduler.schedule(() => service.searchByResource(resourceUUID, action));
+      scheduler.flush();
+
+      expect((service as any).dataService.searchBy).toHaveBeenCalledWith((service as any).searchByResourceMethod, options, true);
+    });
+
+    it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
+      const result = service.searchByResource(resourceUUID);
+      const expected = cold('a|', {
+        a: paginatedListRD
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/core/resource-policy/resource-policy.service.ts b/src/app/core/resource-policy/resource-policy.service.ts
new file mode 100644
index 00000000000..5f5c6f3cccb
--- /dev/null
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -0,0 +1,210 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { dataService } from '../cache/builders/build-decorators';
+
+import { DataService } from '../data/data.service';
+import { RequestService } from '../data/request.service';
+import { FindListOptions } from '../data/request.models';
+import { Collection } from '../shared/collection.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ResourcePolicy } from './models/resource-policy.model';
+import { RemoteData } from '../data/remote-data';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RESOURCE_POLICY } from './models/resource-policy.resource-type';
+import { ChangeAnalyzer } from '../data/change-analyzer';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { PaginatedList } from '../data/paginated-list.model';
+import { ActionType } from './models/action-type.model';
+import { RequestParam } from '../cache/models/request-param.model';
+import { isNotEmpty } from '../../shared/empty.util';
+import { map } from 'rxjs/operators';
+import { NoContent } from '../shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * A private DataService implementation to delegate specific methods to.
+ */
+class DataServiceImpl extends DataService<ResourcePolicy> {
+  protected linkPath = 'resourcepolicies';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: ChangeAnalyzer<ResourcePolicy>) {
+    super();
+  }
+
+}
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the resourcepolicies endpoint
+ */
+@Injectable()
+@dataService(RESOURCE_POLICY)
+export class ResourcePolicyService {
+  private dataService: DataServiceImpl;
+  protected searchByEPersonMethod = 'eperson';
+  protected searchByGroupMethod = 'group';
+  protected searchByResourceMethod = 'resource';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<ResourcePolicy>) {
+    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+  }
+
+  /**
+   * Create a new ResourcePolicy on the server, and store the response
+   * in the object cache
+   *
+   * @param {ResourcePolicy} resourcePolicy
+   *    The resource policy to create
+   * @param {string} resourceUUID
+   *    The uuid of the resource target of the policy
+   * @param {string} epersonUUID
+   *    The uuid of the eperson that will be grant of the permission. Exactly one of eperson or group is required
+   * @param {string} groupUUID
+   *    The uuid of the group that will be grant of the permission. Exactly one of eperson or group is required
+   */
+  create(resourcePolicy: ResourcePolicy, resourceUUID: string, epersonUUID?: string, groupUUID?: string): Observable<RemoteData<ResourcePolicy>> {
+    const params = [];
+    params.push(new RequestParam('resource', resourceUUID));
+    if (isNotEmpty(epersonUUID)) {
+      params.push(new RequestParam('eperson', epersonUUID));
+    } else if (isNotEmpty(groupUUID)) {
+      params.push(new RequestParam('group', groupUUID));
+    }
+    return this.dataService.create(resourcePolicy, ...params);
+  }
+
+  /**
+   * Delete an existing ResourcePolicy on the server
+   *
+   * @param resourcePolicyID The resource policy's id to be removed
+   * @return an observable that emits true when the deletion was successful, false when it failed
+   */
+  delete(resourcePolicyID: string): Observable<boolean> {
+    return this.dataService.delete(resourcePolicyID).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+    );
+  }
+
+  /**
+   * Add a new patch to the object cache
+   * The patch is derived from the differences between the given object and its version in the object cache
+   * @param {ResourcePolicy} object The given object
+   */
+  update(object: ResourcePolicy): Observable<RemoteData<ResourcePolicy>> {
+    return this.dataService.update(object);
+  }
+
+  /**
+   * Returns an observable of {@link RemoteData} of a {@link ResourcePolicy}, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the {@link ResourcePolicy}
+   * @param href              The url of {@link ResourcePolicy} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<ResourcePolicy>>): Observable<RemoteData<ResourcePolicy>> {
+    return this.dataService.findByHref(href, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns an observable of {@link RemoteData} of a {@link ResourcePolicy}, based on its ID, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param id                ID of {@link ResourcePolicy} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findById(id: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<ResourcePolicy>>): Observable<RemoteData<ResourcePolicy>> {
+    return this.dataService.findById(id, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Return the defaultAccessConditions {@link ResourcePolicy} list for a given {@link Collection}
+   *
+   * @param collection the {@link Collection} to retrieve the defaultAccessConditions for
+   * @param findListOptions the {@link FindListOptions} for the request
+   */
+  getDefaultAccessConditionsFor(collection: Collection, findListOptions?: FindListOptions): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
+    return this.dataService.findAllByHref(collection._links.defaultAccessConditions.href, findListOptions);
+  }
+
+  /**
+   * Return the {@link ResourcePolicy} list for a {@link EPerson}
+   *
+   * @param UUID              UUID of a given {@link EPerson}
+   * @param resourceUUID      Limit the returned policies to the specified DSO
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  searchByEPerson(UUID: string, resourceUUID?: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<ResourcePolicy>>): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
+    const options = new FindListOptions();
+    options.searchParams = [new RequestParam('uuid', UUID)];
+    if (isNotEmpty(resourceUUID)) {
+      options.searchParams.push(new RequestParam('resource', resourceUUID))
+    }
+    return this.dataService.searchBy(this.searchByEPersonMethod, options, reRequestOnStale, ...linksToFollow)
+  }
+
+  /**
+   * Return the {@link ResourcePolicy} list for a {@link Group}
+   *
+   * @param UUID              UUID of a given {@link Group}
+   * @param resourceUUID      Limit the returned policies to the specified DSO
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  searchByGroup(UUID: string, resourceUUID?: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<ResourcePolicy>>): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
+    const options = new FindListOptions();
+    options.searchParams = [new RequestParam('uuid', UUID)];
+    if (isNotEmpty(resourceUUID)) {
+      options.searchParams.push(new RequestParam('resource', resourceUUID))
+    }
+    return this.dataService.searchBy(this.searchByGroupMethod, options, reRequestOnStale, ...linksToFollow)
+  }
+
+  /**
+   * Return the {@link ResourcePolicy} list for a given DSO
+   *
+   * @param UUID              UUID of a given DSO
+   * @param action            Limit the returned policies to the specified {@link ActionType}
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  searchByResource(UUID: string, action?: ActionType, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<ResourcePolicy>>): Observable<RemoteData<PaginatedList<ResourcePolicy>>> {
+    const options = new FindListOptions();
+    options.searchParams = [new RequestParam('uuid', UUID)];
+    if (isNotEmpty(action)) {
+      options.searchParams.push(new RequestParam('action', action))
+    }
+    return this.dataService.searchBy(this.searchByResourceMethod, options, reRequestOnStale, ...linksToFollow)
+  }
+
+}
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/services/browser-hard-redirect.service.spec.ts b/src/app/core/services/browser-hard-redirect.service.spec.ts
new file mode 100644
index 00000000000..64518579aae
--- /dev/null
+++ b/src/app/core/services/browser-hard-redirect.service.spec.ts
@@ -0,0 +1,50 @@
+import {TestBed} from '@angular/core/testing';
+import {BrowserHardRedirectService} from './browser-hard-redirect.service';
+
+describe('BrowserHardRedirectService', () => {
+  const origin = 'test origin';
+  const mockLocation = {
+    href: undefined,
+    pathname: '/pathname',
+    search: '/search',
+    origin
+  } as Location;
+
+  const service: BrowserHardRedirectService = new BrowserHardRedirectService(mockLocation);
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('when performing a redirect', () => {
+
+    const redirect = 'test redirect';
+
+    beforeEach(() => {
+      service.redirect(redirect);
+    });
+
+    it('should update the location', () => {
+      expect(mockLocation.href).toEqual(redirect);
+    })
+  });
+
+  describe('when requesting the current route', () => {
+
+    it('should return the location origin', () => {
+      expect(service.getCurrentRoute()).toEqual(mockLocation.pathname + mockLocation.search);
+    });
+  });
+
+  describe('when requesting the origin', () => {
+
+    it('should return the location origin', () => {
+      expect(service.getRequestOrigin()).toEqual(origin);
+    });
+  });
+
+});
diff --git a/src/app/core/services/browser-hard-redirect.service.ts b/src/app/core/services/browser-hard-redirect.service.ts
new file mode 100644
index 00000000000..4b7424bee2c
--- /dev/null
+++ b/src/app/core/services/browser-hard-redirect.service.ts
@@ -0,0 +1,43 @@
+import { Inject, Injectable, InjectionToken } from '@angular/core';
+import { HardRedirectService } from './hard-redirect.service';
+
+export const LocationToken = new InjectionToken('Location');
+
+export function locationProvider(): Location {
+  return window.location;
+}
+
+/**
+ * Service for performing hard redirects within the browser app module
+ */
+@Injectable()
+export class BrowserHardRedirectService extends HardRedirectService {
+
+  constructor(
+    @Inject(LocationToken) protected location: Location,
+  ) {
+    super();
+  }
+
+  /**
+   * Perform a hard redirect to URL
+   * @param url
+   */
+  redirect(url: string) {
+    this.location.href = url;
+  }
+
+  /**
+   * Get the origin of a request
+   */
+  getCurrentRoute() {
+    return this.location.pathname + this.location.search;
+  }
+
+  /**
+   * Get the hostname of the request
+   */
+  getRequestOrigin() {
+    return this.location.origin;
+  }
+}
diff --git a/src/app/core/services/hard-redirect.service.spec.ts b/src/app/core/services/hard-redirect.service.spec.ts
new file mode 100644
index 00000000000..f7e2ba89557
--- /dev/null
+++ b/src/app/core/services/hard-redirect.service.spec.ts
@@ -0,0 +1,57 @@
+import { HardRedirectService } from './hard-redirect.service';
+import { environment } from '../../../environments/environment';
+import { TestBed } from '@angular/core/testing';
+import { Injectable } from '@angular/core';
+
+const requestOrigin = 'http://dspace-angular-ui.dspace.com';
+
+describe('HardRedirectService', () => {
+  let service: TestHardRedirectService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({ providers: [TestHardRedirectService] });
+    service = TestBed.get(TestHardRedirectService);
+  });
+
+  describe('when calling rewriteDownloadURL', () => {
+    let originalValue;
+    const relativePath = '/test/url/path';
+    const testURL = environment.rest.baseUrl + relativePath;
+    beforeEach(() => {
+      originalValue = environment.rewriteDownloadUrls;
+    });
+
+    it('it should return the same url when rewriteDownloadURL is false', () => {
+      environment.rewriteDownloadUrls = false;
+      expect(service.rewriteDownloadURL(testURL)).toEqual(testURL);
+    });
+
+    it('it should replace part of the url when rewriteDownloadURL is true', () => {
+      environment.rewriteDownloadUrls = true;
+      expect(service.rewriteDownloadURL(testURL)).toEqual(requestOrigin + environment.rest.nameSpace + relativePath);
+    });
+
+    afterEach(() => {
+      environment.rewriteDownloadUrls = originalValue;
+    })
+  });
+});
+
+@Injectable()
+class TestHardRedirectService extends HardRedirectService {
+  constructor() {
+    super();
+  }
+
+  redirect(url: string) {
+    return undefined;
+  }
+
+  getCurrentRoute() {
+    return undefined;
+  }
+
+  getRequestOrigin() {
+    return requestOrigin;
+  }
+}
diff --git a/src/app/core/services/hard-redirect.service.ts b/src/app/core/services/hard-redirect.service.ts
new file mode 100644
index 00000000000..a09521dae59
--- /dev/null
+++ b/src/app/core/services/hard-redirect.service.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core';
+import { environment } from '../../../environments/environment';
+import { URLCombiner } from '../url-combiner/url-combiner';
+
+/**
+ * Service to take care of hard redirects
+ */
+@Injectable()
+export abstract class HardRedirectService {
+
+  /**
+   * Perform a hard redirect to a given location.
+   *
+   * @param url
+   *    the page to redirect to
+   */
+  abstract redirect(url: string);
+
+  /**
+   * Get the current route, with query params included
+   * e.g. /search?page=1&query=open%20access&f.dateIssued.min=1980&f.dateIssued.max=2020
+   */
+  abstract getCurrentRoute();
+
+  /**
+   * Get the hostname of the request
+   */
+  abstract getRequestOrigin();
+
+  public rewriteDownloadURL(originalUrl: string): string {
+    if (environment.rewriteDownloadUrls) {
+      const hostName = this.getRequestOrigin();
+      const namespace = environment.rest.nameSpace;
+      const rewrittenUrl = new URLCombiner(hostName, namespace).toString();
+      return originalUrl.replace(environment.rest.baseUrl, rewrittenUrl);
+    } else {
+      return originalUrl;
+    }
+  }
+}
diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
new file mode 100644
index 00000000000..dc89517468a
--- /dev/null
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -0,0 +1,56 @@
+import { TestBed } from '@angular/core/testing';
+import { ServerHardRedirectService } from './server-hard-redirect.service';
+
+describe('ServerHardRedirectService', () => {
+
+  const mockRequest = jasmine.createSpyObj(['get']);
+  const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
+
+  const service: ServerHardRedirectService = new ServerHardRedirectService(mockRequest, mockResponse);
+  const origin = 'test-host';
+
+  beforeEach(() => {
+    mockRequest.headers = {
+      host: 'test-host',
+    };
+
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('when performing a redirect', () => {
+
+    const redirect = 'test redirect';
+
+    beforeEach(() => {
+      service.redirect(redirect);
+    });
+
+    it('should update the response object', () => {
+      expect(mockResponse.redirect).toHaveBeenCalledWith(302, redirect);
+      expect(mockResponse.end).toHaveBeenCalled();
+    })
+  });
+
+  describe('when requesting the current route', () => {
+
+    beforeEach(() => {
+      mockRequest.originalUrl = 'original/url';
+    });
+
+    it('should return the location origin', () => {
+      expect(service.getCurrentRoute()).toEqual(mockRequest.originalUrl);
+    });
+  });
+
+  describe('when requesting the origin', () => {
+
+    it('should return the location origin', () => {
+      expect(service.getRequestOrigin()).toEqual(origin);
+    });
+  });
+
+});
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
new file mode 100644
index 00000000000..65b404ca6cf
--- /dev/null
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -0,0 +1,70 @@
+import { Inject, Injectable } from '@angular/core';
+import { Request, Response } from 'express';
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
+import { HardRedirectService } from './hard-redirect.service';
+
+/**
+ * Service for performing hard redirects within the server app module
+ */
+@Injectable()
+export class ServerHardRedirectService extends HardRedirectService {
+
+  constructor(
+    @Inject(REQUEST) protected req: Request,
+    @Inject(RESPONSE) protected res: Response,
+  ) {
+    super();
+  }
+
+  /**
+   * Perform a hard redirect to URL
+   * @param url
+   */
+  redirect(url: string) {
+
+    if (url === this.req.url) {
+      return;
+    }
+
+    if (this.res.finished) {
+      const req: any = this.req;
+      req._r_count = (req._r_count || 0) + 1;
+
+      console.warn('Attempted to redirect on a finished response. From',
+        this.req.url, 'to', url);
+
+      if (req._r_count > 10) {
+        console.error('Detected a redirection loop. killing the nodejs process');
+        process.exit(1);
+      }
+    } else {
+      // attempt to use the already set status
+      let status = this.res.statusCode || 0;
+      if (status < 300 || status >= 400) {
+        // temporary redirect
+        status = 302;
+      }
+
+      console.log(`Redirecting from ${this.req.url} to ${url} with ${status}`);
+      this.res.redirect(status, url);
+      this.res.end();
+      // I haven't found a way to correctly stop Angular rendering.
+      // So we just let it end its work, though we have already closed
+      // the response.
+    }
+  }
+
+  /**
+   * Get the origin of a request
+   */
+  getCurrentRoute() {
+    return this.req.originalUrl;
+  }
+
+  /**
+   * Get the hostname of the request
+   */
+  getRequestOrigin() {
+    return this.req.headers.host;
+  }
+}
diff --git a/src/app/core/services/server-response.service.ts b/src/app/core/services/server-response.service.ts
index f143c56ffbd..adf2ecf4d20 100644
--- a/src/app/core/services/server-response.service.ts
+++ b/src/app/core/services/server-response.service.ts
@@ -20,6 +20,14 @@ export class ServerResponseService {
     return this;
   }
 
+  setUnauthorized(message = 'Unauthorized'): this {
+    return this.setStatus(401, message)
+  }
+
+  setForbidden(message = 'Forbidden'): this {
+    return this.setStatus(403, message)
+  }
+
   setNotFound(message = 'Not found'): this {
     return this.setStatus(404, message)
   }
diff --git a/src/app/core/shared/NoContent.model.ts b/src/app/core/shared/NoContent.model.ts
new file mode 100644
index 00000000000..2bd1d110acf
--- /dev/null
+++ b/src/app/core/shared/NoContent.model.ts
@@ -0,0 +1,4 @@
+/**
+ * Represents the payload of a purposefully empty rest response
+ */
+export interface NoContent {}
diff --git a/src/app/core/shared/authorization.model.ts b/src/app/core/shared/authorization.model.ts
new file mode 100644
index 00000000000..0dfb7fd6314
--- /dev/null
+++ b/src/app/core/shared/authorization.model.ts
@@ -0,0 +1,54 @@
+import { link, typedObject } from '../cache/builders/build-decorators';
+import { AUTHORIZATION } from './authorization.resource-type';
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import { HALLink } from './hal-link.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../data/remote-data';
+import { EPerson } from '../eperson/models/eperson.model';
+import { EPERSON } from '../eperson/models/eperson.resource-type';
+import { FEATURE } from './feature.resource-type';
+import { DSpaceObject } from './dspace-object.model';
+import { Feature } from './feature.model';
+import { ITEM } from './item.resource-type';
+
+/**
+ * Class representing a DSpace Authorization
+ */
+@typedObject
+@inheritSerialization(DSpaceObject)
+export class Authorization extends DSpaceObject {
+  static type = AUTHORIZATION;
+
+  /**
+   * Unique identifier for this authorization
+   */
+  @autoserialize
+  id: string;
+
+  @deserialize
+  _links: {
+    self: HALLink;
+    eperson: HALLink;
+    feature: HALLink;
+    object: HALLink;
+  };
+
+  /**
+   * The EPerson this Authorization belongs to
+   * Null if the authorization grants access to anonymous users
+   */
+  @link(EPERSON)
+  eperson?: Observable<RemoteData<EPerson>>;
+
+  /**
+   * The Feature enabled by this Authorization
+   */
+  @link(FEATURE)
+  feature?: Observable<RemoteData<Feature>>;
+
+  /**
+   * The Object this authorization applies to
+   */
+  @link(ITEM)
+  object?: Observable<RemoteData<DSpaceObject>>;
+}
diff --git a/src/app/core/shared/resource-policy.resource-type.ts b/src/app/core/shared/authorization.resource-type.ts
similarity index 57%
rename from src/app/core/shared/resource-policy.resource-type.ts
rename to src/app/core/shared/authorization.resource-type.ts
index 1811a3a0d13..e5547314b33 100644
--- a/src/app/core/shared/resource-policy.resource-type.ts
+++ b/src/app/core/shared/authorization.resource-type.ts
@@ -1,9 +1,9 @@
 import { ResourceType } from './resource-type';
 
 /**
- * The resource type for ResourcePolicy
+ * The resource type for Authorization
  *
  * Needs to be in a separate file to prevent circular
  * dependencies in webpack.
  */
-export const RESOURCE_POLICY = new ResourceType('resourcePolicy');
+export const AUTHORIZATION = new ResourceType('authorization');
diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts
index ab9d1548b7e..314818b4825 100644
--- a/src/app/core/shared/bitstream.model.ts
+++ b/src/app/core/shared/bitstream.model.ts
@@ -8,6 +8,8 @@ import { BITSTREAM } from './bitstream.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
 import { HALResource } from './hal-resource.model';
+import {BUNDLE} from './bundle.resource-type';
+import {Bundle} from './bundle.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -57,4 +59,10 @@ export class Bitstream extends DSpaceObject implements HALResource {
   @link(BITSTREAM_FORMAT, false, 'format')
   format?: Observable<RemoteData<BitstreamFormat>>;
 
+  /**
+   * The owning bundle for this Bitstream
+   * Will be undefined unless the bundle{@link HALLink} has been resolved.
+   */
+  @link(BUNDLE)
+  bundle?: Observable<RemoteData<Bundle>>;
 }
diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index e1d0e0bf013..2c08417b6d7 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,6 +1,6 @@
 import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
 import { typedObject } from '../cache/builders/build-decorators';
-import { TypedObject } from '../cache/object-cache.reducer';
+import { CacheableObject } from '../cache/object-cache.reducer';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { BROWSE_DEFINITION } from './browse-definition.resource-type';
 import { HALLink } from './hal-link.model';
@@ -8,7 +8,7 @@ import { ResourceType } from './resource-type';
 import { SortOption } from './sort-option.model';
 
 @typedObject
-export class BrowseDefinition implements TypedObject {
+export class BrowseDefinition extends CacheableObject {
   static type = BROWSE_DEFINITION;
 
   /**
diff --git a/src/app/core/shared/bundle.model.ts b/src/app/core/shared/bundle.model.ts
index c1164f0fc49..36b7012e47e 100644
--- a/src/app/core/shared/bundle.model.ts
+++ b/src/app/core/shared/bundle.model.ts
@@ -1,8 +1,17 @@
 import { deserialize, inheritSerialization } from 'cerialize';
-import { typedObject } from '../cache/builders/build-decorators';
+
+import { Observable } from 'rxjs';
+
+import { link, typedObject } from '../cache/builders/build-decorators';
 import { BUNDLE } from './bundle.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
+import { RemoteData } from '../data/remote-data';
+import { PaginatedList } from '../data/paginated-list.model';
+import { BITSTREAM } from './bitstream.resource-type';
+import { Bitstream } from './bitstream.model';
+import { ITEM } from './item.resource-type';
+import { Item } from './item.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -17,5 +26,27 @@ export class Bundle extends DSpaceObject {
     self: HALLink;
     primaryBitstream: HALLink;
     bitstreams: HALLink;
-  }
+    item: HALLink;
+  };
+
+  /**
+   * The primary Bitstream of this Bundle
+   * Will be undefined unless the primaryBitstream {@link HALLink} has been resolved.
+   */
+  @link(BITSTREAM)
+  primaryBitstream?: Observable<RemoteData<Bitstream>>;
+
+  /**
+   * The list of Bitstreams that are direct children of this Bundle
+   * Will be undefined unless the bitstreams {@link HALLink} has been resolved.
+   */
+  @link(BITSTREAM, true)
+  bitstreams?: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+    /**
+     * The owning item for this Bundle
+     * Will be undefined unless the Item{@link HALLink} has been resolved.
+     */
+  @link(ITEM)
+  item?: Observable<RemoteData<Item>>;
 }
diff --git a/src/app/core/shared/collection.model.spec.ts b/src/app/core/shared/collection.model.spec.ts
new file mode 100644
index 00000000000..b35fa7415b5
--- /dev/null
+++ b/src/app/core/shared/collection.model.spec.ts
@@ -0,0 +1,24 @@
+import {Collection} from './collection.model';
+
+describe('Collection', () => {
+
+  describe('Collection handle value',  () => {
+
+    let metadataValue;
+
+    beforeEach(() => {
+      metadataValue = {'dc.identifier.uri': [ { value: '123456789/1'}]};
+    })
+
+    it('should return the handle value from metadata', () => {
+      const community = Object.assign(new Collection(), { metadata: metadataValue });
+      expect(community.handle).toEqual('123456789/1');
+    });
+
+    it('should return undefined if the handle value from metadata is not present', () => {
+      const community = Object.assign(new Collection(), { });
+      expect(community.handle).toEqual(undefined);
+    });
+  });
+
+});
diff --git a/src/app/core/shared/collection.model.ts b/src/app/core/shared/collection.model.ts
index 4e0b5ead83f..30259b7dbe7 100644
--- a/src/app/core/shared/collection.model.ts
+++ b/src/app/core/shared/collection.model.ts
@@ -1,7 +1,7 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import { deserialize, inheritSerialization } from 'cerialize';
 import { Observable } from 'rxjs';
 import { link, typedObject } from '../cache/builders/build-decorators';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { Bitstream } from './bitstream.model';
 import { BITSTREAM } from './bitstream.resource-type';
@@ -10,25 +10,17 @@ import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
 import { License } from './license.model';
 import { LICENSE } from './license.resource-type';
-import { ResourcePolicy } from './resource-policy.model';
-import { RESOURCE_POLICY } from './resource-policy.resource-type';
+import { ResourcePolicy } from '../resource-policy/models/resource-policy.model';
+import { RESOURCE_POLICY } from '../resource-policy/models/resource-policy.resource-type';
 import { COMMUNITY } from './community.resource-type';
 import { Community } from './community.model';
 import { ChildHALResource } from './child-hal-resource.model';
-import { GROUP } from '../eperson/models/group.resource-type';
-import { Group } from '../eperson/models/group.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
 export class Collection extends DSpaceObject implements ChildHALResource {
   static type = COLLECTION;
 
-  /**
-   * A string representing the unique handle of this Collection
-   */
-  @autoserialize
-  handle: string;
-
   /**
    * The {@link HALLink}s for this Collection
    */
@@ -41,6 +33,11 @@ export class Collection extends DSpaceObject implements ChildHALResource {
     defaultAccessConditions: HALLink;
     logo: HALLink;
     parentCommunity: HALLink;
+    workflowGroups: HALLink[];
+    adminGroup: HALLink;
+    submittersGroup: HALLink;
+    itemReadGroup: HALLink;
+    bitstreamReadGroup: HALLink;
     self: HALLink;
   };
 
@@ -73,10 +70,11 @@ export class Collection extends DSpaceObject implements ChildHALResource {
   parentCommunity?: Observable<RemoteData<Community>>;
 
   /**
-   * The administrators group of this community.
+   * A string representing the unique handle of this Collection
    */
-  @link(GROUP)
-  adminGroup?: Observable<RemoteData<Group>>;
+  get handle(): string {
+    return this.firstMetadataValue('dc.identifier.uri');
+  }
 
   /**
    * The introductory text of this Collection
diff --git a/src/app/core/shared/community.model.spec.ts b/src/app/core/shared/community.model.spec.ts
new file mode 100644
index 00000000000..56976868538
--- /dev/null
+++ b/src/app/core/shared/community.model.spec.ts
@@ -0,0 +1,24 @@
+import {Community} from './community.model';
+
+describe('Community', () => {
+
+  describe('Community handle value',  () => {
+
+    let metadataValue;
+
+    beforeEach(() => {
+      metadataValue = {'dc.identifier.uri': [ { value: '123456789/1'}]};
+    })
+
+    it('should return the handle value from metadata', () => {
+      const community = Object.assign(new Community(), { metadata: metadataValue });
+      expect(community.handle).toEqual('123456789/1');
+    });
+
+    it('should return undefined if the handle value from metadata is not present', () => {
+      const community = Object.assign(new Community(), { });
+      expect(community.handle).toEqual(undefined);
+    });
+  });
+
+});
diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts
index bdcda70e9be..afe2c6dfef4 100644
--- a/src/app/core/shared/community.model.ts
+++ b/src/app/core/shared/community.model.ts
@@ -1,10 +1,8 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import { deserialize, inheritSerialization } from 'cerialize';
 import { Observable } from 'rxjs';
 import { link, typedObject } from '../cache/builders/build-decorators';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { Group } from '../eperson/models/group.model';
-import { GROUP } from '../eperson/models/group.resource-type';
 import { Bitstream } from './bitstream.model';
 import { BITSTREAM } from './bitstream.resource-type';
 import { Collection } from './collection.model';
@@ -19,12 +17,6 @@ import { ChildHALResource } from './child-hal-resource.model';
 export class Community extends DSpaceObject implements ChildHALResource {
   static type = COMMUNITY;
 
-  /**
-   * A string representing the unique handle of this Community
-   */
-  @autoserialize
-  handle: string;
-
   /**
    * The {@link HALLink}s for this Community
    */
@@ -67,10 +59,11 @@ export class Community extends DSpaceObject implements ChildHALResource {
   parentCommunity?: Observable<RemoteData<Community>>;
 
   /**
-   * The administrators group of this community.
+   * A string representing the unique handle of this Community
    */
-  @link(GROUP)
-  adminGroup?: Observable<RemoteData<Group>>;
+  get handle(): string {
+    return this.firstMetadataValue('dc.identifier.uri');
+  }
 
   /**
    * The introductory text of this Community
diff --git a/src/app/core/integration/models/confidence-type.ts b/src/app/core/shared/confidence-type.ts
similarity index 100%
rename from src/app/core/integration/models/confidence-type.ts
rename to src/app/core/shared/confidence-type.ts
diff --git a/src/app/core/shared/config-property.resource-type.ts b/src/app/core/shared/config-property.resource-type.ts
new file mode 100644
index 00000000000..b93c29dd66f
--- /dev/null
+++ b/src/app/core/shared/config-property.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from './resource-type';
+
+/**
+ * The resource type for ConfigurationProperty
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const CONFIG_PROPERTY = new ResourceType('property');
diff --git a/src/app/core/shared/configuration-property.model.ts b/src/app/core/shared/configuration-property.model.ts
new file mode 100644
index 00000000000..465523c29f2
--- /dev/null
+++ b/src/app/core/shared/configuration-property.model.ts
@@ -0,0 +1,48 @@
+import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { HALLink } from './hal-link.model';
+import { ResourceType } from './resource-type';
+import { CONFIG_PROPERTY } from './config-property.resource-type';
+
+/**
+ * Model class for a Configuration Property
+ */
+@typedObject
+export class ConfigurationProperty implements CacheableObject {
+  static type = CONFIG_PROPERTY;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The uuid of the configuration property
+   * The name is used as id for configuration properties
+   */
+  @autoserializeAs(String, 'name')
+  uuid: string;
+
+  /**
+   * The name of the configuration property
+   */
+  @autoserialize
+  name: string;
+
+  /**
+   * The values of the configuration property
+   */
+  @autoserialize
+  values: string[];
+
+  /**
+   * The links of the configuration property
+   */
+  @deserialize
+  _links: { self: HALLink };
+
+}
diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts
index 3e530b6a3ab..660b9f925da 100644
--- a/src/app/core/shared/content-source.model.ts
+++ b/src/app/core/shared/content-source.model.ts
@@ -1,7 +1,11 @@
-import { autoserialize, autoserializeAs, deserializeAs, deserialize } from 'cerialize';
+import { autoserializeAs, deserializeAs, deserialize, autoserialize } from 'cerialize';
 import { HALLink } from './hal-link.model';
-import { HALResource } from './hal-resource.model';
 import { MetadataConfig } from './metadata-config.model';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { typedObject } from '../cache/builders/build-decorators';
+import { CONTENT_SOURCE } from './content-source.resource-type';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { ResourceType } from './resource-type';
 
 /**
  * The type of content harvesting used
@@ -16,7 +20,19 @@ export enum ContentSourceHarvestType {
 /**
  * A model class that holds information about the Content Source of a Collection
  */
-export class ContentSource implements HALResource {
+@typedObject
+export class ContentSource extends CacheableObject {
+  static type = CONTENT_SOURCE;
+
+  /**
+   * The object type
+   *
+   * The rest api doesn't provide one, so it's hardcoded here,
+   * and we need a custom responseparser for ContentSource responses
+   */
+  @excludeFromEquals
+  type: ResourceType = CONTENT_SOURCE;
+
   /**
    * Unique identifier, this is necessary to store the ContentSource in FieldUpdates
    * Because the ContentSource coming from the REST API doesn't have a UUID, we're using the selflink
diff --git a/src/app/core/shared/content-source.resource-type.ts b/src/app/core/shared/content-source.resource-type.ts
new file mode 100644
index 00000000000..6c6856278cc
--- /dev/null
+++ b/src/app/core/shared/content-source.resource-type.ts
@@ -0,0 +1,3 @@
+import { ResourceType } from './resource-type';
+
+export const CONTENT_SOURCE = new ResourceType('contentsource');
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index ff24b7d0908..3613a143bd4 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -9,7 +9,10 @@ export enum Context {
   Workflow = 'workflow',
   Workspace = 'workspace',
   AdminMenu = 'adminMenu',
-  SubmissionModal = 'submissionModal',
+  EntitySearchModalWithNameVariants = 'EntitySearchModalWithNameVariants',
+  EntitySearchModal = 'EntitySearchModal',
   AdminSearch = 'adminSearch',
   AdminWorkflowSearch = 'adminWorkflowSearch',
+  SideBarSearchModal = 'sideBarSearchModal',
+  SideBarSearchModalCurrent = 'sideBarSearchModalCurrent',
 }
diff --git a/src/app/core/shared/dspace-object-type.model.ts b/src/app/core/shared/dspace-object-type.model.ts
index 7e2c1cb6784..a5139e8b72f 100644
--- a/src/app/core/shared/dspace-object-type.model.ts
+++ b/src/app/core/shared/dspace-object-type.model.ts
@@ -4,4 +4,5 @@ export enum DSpaceObjectType {
   ITEM = 'ITEM',
   COLLECTION = 'COLLECTION',
   COMMUNITY = 'COMMUNITY',
+  DSPACEOBJECT = 'DSPACEOBJECT',
 }
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index a9256fbb7f4..5c8d490035a 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -39,7 +39,7 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
   id: string;
 
   /**
-   * The universally unique identifier of this DSpaceObject
+   * The universally unique ide ntifier of this DSpaceObject
    */
   @autoserializeAs(String)
   uuid: string;
@@ -184,4 +184,25 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
   getRenderTypes(): Array<string | GenericConstructor<ListableObject>> {
     return [this.constructor as GenericConstructor<ListableObject>];
   }
+
+  setMetadata(key: string, language?: string, ...values: string[]) {
+    const mdValues: MetadataValue[] = values.map((value: string, index: number) => {
+      const md = new MetadataValue();
+      md.value = value;
+      md.authority = null;
+      md.confidence = -1;
+      md.language = language || null;
+      md.place = index;
+      return md;
+    });
+    if (hasNoValue(this.metadata)) {
+      this.metadata = Object.create({});
+    }
+    this.metadata[key] = mdValues;
+  }
+
+  removeMetadata(key: string) {
+    delete this.metadata[key];
+  }
+
 }
diff --git a/src/app/core/shared/feature.model.ts b/src/app/core/shared/feature.model.ts
new file mode 100644
index 00000000000..2ba5d8d4e16
--- /dev/null
+++ b/src/app/core/shared/feature.model.ts
@@ -0,0 +1,37 @@
+import { typedObject } from '../cache/builders/build-decorators';
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import { FEATURE } from './feature.resource-type';
+import { DSpaceObject } from './dspace-object.model';
+import { HALLink } from './hal-link.model';
+
+/**
+ * Class representing a DSpace Feature
+ */
+@typedObject
+@inheritSerialization(DSpaceObject)
+export class Feature extends DSpaceObject {
+  static type = FEATURE;
+
+  /**
+   * Unique identifier for this feature
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * A human readable description of the feature's purpose
+   */
+  @autoserialize
+  description: string;
+
+  /**
+   * A list of resource types this feature applies to
+   */
+  @autoserialize
+  resourcetypes: string[];
+
+  @deserialize
+  _links: {
+    self: HALLink;
+  };
+}
diff --git a/src/app/core/shared/feature.resource-type.ts b/src/app/core/shared/feature.resource-type.ts
new file mode 100644
index 00000000000..98ee526ce3a
--- /dev/null
+++ b/src/app/core/shared/feature.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from './resource-type';
+
+/**
+ * The resource type for Feature
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const FEATURE = new ResourceType('feature');
diff --git a/src/app/core/shared/file.service.ts b/src/app/core/shared/file.service.ts
index 7e89a4e5dd2..73be9c32d8b 100644
--- a/src/app/core/shared/file.service.ts
+++ b/src/app/core/shared/file.service.ts
@@ -1,10 +1,10 @@
-import { Injectable } from '@angular/core';
-import { HttpHeaders } from '@angular/common/http';
-
-import { DSpaceRESTv2Service, HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { saveAs } from 'file-saver';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { Inject, Injectable } from '@angular/core';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { AuthService } from '../auth/auth.service';
+import { take } from 'rxjs/operators';
+import { NativeWindowRef, NativeWindowService } from '../services/window.service';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * Provides utility methods to save files on the client-side.
@@ -12,31 +12,29 @@ import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.
 @Injectable()
 export class FileService {
   constructor(
-    private restService: DSpaceRESTv2Service
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    private authService: AuthService
   ) { }
 
   /**
-   * Makes a HTTP Get request to download a file
+   * Combines an URL with a short-lived token and sets the current URL to the newly created one
    *
    * @param url
    *    file url
    */
   downloadFile(url: string) {
-    const headers = new HttpHeaders();
-    const options: HttpOptions = Object.create({headers, responseType: 'blob'});
-    return this.restService.request(RestRequestMethod.GET, url, null, options)
-      .subscribe((data) => {
-        saveAs(data.payload as Blob, this.getFileNameFromResponseContentDisposition(data));
-      });
+    this.authService.getShortlivedToken().pipe(take(1)).subscribe((token) => {
+      this._window.nativeWindow.location.href = hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url;
+    });
   }
 
   /**
    * Derives file name from the http response
    * by looking inside content-disposition
    * @param res
-   *    http DSpaceRESTV2Response
+   *    http RawRestResponse
    */
-  getFileNameFromResponseContentDisposition(res: DSpaceRESTV2Response) {
+  getFileNameFromResponseContentDisposition(res: RawRestResponse) {
     // NOTE: to be able to retrieve 'Content-Disposition' header,
     // you need to set 'Access-Control-Expose-Headers': 'Content-Disposition' ON SERVER SIDE
     const contentDisposition = res.headers.get('content-disposition') || '';
diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts
index 5f5c31f29d9..55538a5c2ec 100644
--- a/src/app/core/shared/hal-endpoint.service.spec.ts
+++ b/src/app/core/shared/hal-endpoint.service.spec.ts
@@ -1,74 +1,103 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { cold, hot } from 'jasmine-marbles';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from './hal-endpoint.service';
 import { EndpointMapRequest } from '../data/request.models';
-import { RequestEntry } from '../data/request.reducer';
-import { of as observableOf } from 'rxjs';
+import { of as observableOf, combineLatest as observableCombineLatest } from 'rxjs';
 import { environment } from '../../../environments/environment';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('HALEndpointService', () => {
   let service: HALEndpointService;
   let requestService: RequestService;
-  let requestEntry;
+  let rdbService: RemoteDataBuildService;
   let envConfig;
   const endpointMap = {
-    test: 'https://rest.api/test',
-    foo: 'https://rest.api/foo',
-    bar: 'https://rest.api/bar',
-    endpoint: 'https://rest.api/endpoint',
-    link: 'https://rest.api/link',
-    another: 'https://rest.api/another',
+    test: {
+      href: 'https://rest.api/test'
+    },
+    foo: {
+      href: 'https://rest.api/foo'
+    },
+    bar: {
+      href: 'https://rest.api/bar'
+    },
+    endpoint: {
+      href: 'https://rest.api/endpoint'
+    },
+    link: {
+      href: 'https://rest.api/link'
+    },
+    another: {
+      href: 'https://rest.api/another'
+    },
   };
   const start = 'http://start.com';
   const one = 'http://one.com';
   const two = 'http://two.com';
   const endpointMaps = {
     [start]: {
-      one: one,
-      two: 'empty',
-      endpoint: 'https://rest.api/endpoint',
-      link: 'https://rest.api/link',
-      another: 'https://rest.api/another',
+      one: {
+        href: one
+      },
+      two: {
+        href: 'empty'
+      },
+      endpoint: {
+        href: 'https://rest.api/endpoint'
+      },
+      link: {
+        href: 'https://rest.api/link'
+      },
+      another: {
+        href: 'https://rest.api/another'
+      },
     },
     [one]: {
-      one: 'empty',
-      two: two,
-      bar: 'https://rest.api/bar',
+      one: {
+        href: 'empty',
+      },
+      two: {
+        href: two,
+      },
+      bar: {
+        href: 'https://rest.api/bar',
+      }
     }
   };
   const linkPath = 'test';
 
   beforeEach(() => {
-    requestEntry = {
-      request: { responseMsToLive: 1000 } as any,
-      requestPending: false,
-      responsePending: false,
-      completed: true,
-      response: { endpointMap: endpointMap } as any
-    } as RequestEntry;
-    requestService = getMockRequestService(observableOf(requestEntry));
+    requestService = getMockRequestService();
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildFromHref: createSuccessfulRemoteDataObject$({
+        _links: endpointMap
+      })
+    });
 
     envConfig = {
       rest: { baseUrl: 'https://rest.api/' }
     } as any;
 
     service = new HALEndpointService(
-      requestService
+      requestService,
+      rdbService
     );
   });
 
   describe('getRootEndpointMap', () => {
     it('should configure a new EndpointMapRequest', () => {
       (service as any).getRootEndpointMap();
-      const expected = new EndpointMapRequest(requestService.generateRequestId(), environment.rest.baseUrl);
+      const expected = new EndpointMapRequest(requestService.generateRequestId(), environment.rest.baseUrl + 'api');
       expect(requestService.configure).toHaveBeenCalledWith(expected);
     });
 
-    it('should return an Observable of the endpoint map', () => {
-      const result = (service as any).getRootEndpointMap();
-      const expected = '(b|)';
-      getTestScheduler().expectObservable(result).toBe(expected, { b: endpointMap });
+    it('should return an Observable of the endpoint map', (done) => {
+      (service as any).getRootEndpointMap().subscribe((result) => {
+        expect(result).toEqual(endpointMap);
+        done();
+      });
     });
 
   });
@@ -81,12 +110,12 @@ describe('HALEndpointService', () => {
       } as any;
     });
 
-    it('should return the endpoint URL for the service\'s linkPath', () => {
+    it(`should return the endpoint URL for the service's linkPath`, () => {
       spyOn(service as any, 'getEndpointAt').and
         .returnValue(hot('a-', { a: 'https://rest.api/test' }));
       const result = service.getEndpoint(linkPath);
 
-      const expected = cold('(b|)', { b: endpointMap.test });
+      const expected = cold('(b|)', { b: endpointMap.test.href });
       expect(result).toBeObservable(expected);
     });
 
@@ -128,17 +157,18 @@ describe('HALEndpointService', () => {
       expect((service as any).getEndpointAt.calls.count()).toBeGreaterThanOrEqual(5);
     });
 
-    it('should return the correct endpoint', () => {
+    it('should return the correct endpoint', (done) => {
       spyOn(service as any, 'getEndpointMapAt').and.callFake((param) => {
         return observableOf(endpointMaps[param]);
       });
 
-      (service as any).getEndpointAt(start, 'one').subscribe((endpoint) => {
-        expect(endpoint).toEqual(one);
-      });
-
-      (service as any).getEndpointAt(start, 'one', 'two').subscribe((endpoint) => {
-        expect(endpoint).toEqual(two);
+      observableCombineLatest([
+        (service as any).getEndpointAt(start, 'one'),
+        (service as any).getEndpointAt(start, 'one', 'two')
+      ]).subscribe(([endpoint1, endpoint2]) => {
+        expect(endpoint1).toEqual(one);
+        expect(endpoint2).toEqual(two);
+        done();
       });
     });
   });
@@ -146,7 +176,8 @@ describe('HALEndpointService', () => {
   describe('isEnabledOnRestApi', () => {
     beforeEach(() => {
       service = new HALEndpointService(
-        requestService
+        requestService,
+        rdbService
       );
 
     });
diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts
index d8b1d8931f7..943fd927582 100644
--- a/src/app/core/shared/hal-endpoint.service.ts
+++ b/src/app/core/shared/hal-endpoint.service.ts
@@ -5,18 +5,23 @@ import { EndpointMapRequest } from '../data/request.models';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
 import { Injectable } from '@angular/core';
-import { EndpointMap, EndpointMapSuccessResponse } from '../cache/response.models';
-import { getResponseFromEntry } from './operators';
-import { URLCombiner } from '../url-combiner/url-combiner';
+import { EndpointMap } from '../cache/response.models';
+import { getFirstCompletedRemoteData } from './operators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RemoteData } from '../data/remote-data';
+import { UnCacheableObject } from './uncacheable-object.model';
 
 @Injectable()
 export class HALEndpointService {
 
-  constructor(private requestService: RequestService) {
+  constructor(
+    private requestService: RequestService,
+    private rdbService: RemoteDataBuildService
+) {
   }
 
   protected getRootHref(): string {
-    return new RESTURLCombiner('/').toString();
+    return new RESTURLCombiner().toString();
   }
 
   protected getRootEndpointMap(): Observable<EndpointMap> {
@@ -31,14 +36,22 @@ export class HALEndpointService {
       this.requestService.configure(request);
     }
 
-    return this.requestService.getByHref(request.href).pipe(
-      getResponseFromEntry(),
-      map((response: EndpointMapSuccessResponse) => response.endpointMap),
-      );
+    return this.rdbService.buildFromHref<UnCacheableObject>(href).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<UnCacheableObject>) => {
+        if (hasValue(response.payload)) {
+          return response.payload._links;
+        } else {
+          console.warn(`No _links section found at ${href}`);
+          return undefined;
+        }
+      }),
+    );
   }
 
   public getEndpoint(linkPath: string, startHref?: string): Observable<string> {
-    return this.getEndpointAt(startHref || this.getRootHref(), ...linkPath.split('/')).pipe(take(1));
+    const halNames = linkPath.split('/').filter((name: string) => isNotEmpty(name));
+    return this.getEndpointAt(startHref || this.getRootHref(), ...halNames).pipe(take(1));
   }
 
   /**
@@ -54,12 +67,11 @@ export class HALEndpointService {
 
     const nextHref$ = this.getEndpointMapAt(href).pipe(
       map((endpointMap: EndpointMap): string => {
-        /*TODO remove if/else block once the rest response contains _links for facets*/
         const nextName = halNames[0];
         if (hasValue(endpointMap) && hasValue(endpointMap[nextName])) {
-          return endpointMap[nextName];
+          return endpointMap[nextName].href;
         } else {
-          return new URLCombiner(href, nextName).toString();
+          throw new Error(`${JSON.stringify(endpointMap)} doesn't contain the link ${nextName}`);
         }
       })
     ) as Observable<string>;
diff --git a/src/app/core/shared/hal-resource.model.ts b/src/app/core/shared/hal-resource.model.ts
index b6ef822a23f..6e4fe1f5020 100644
--- a/src/app/core/shared/hal-resource.model.ts
+++ b/src/app/core/shared/hal-resource.model.ts
@@ -1,4 +1,5 @@
 import { HALLink } from './hal-link.model';
+import { deserialize } from 'cerialize';
 
 /**
  * Represents HAL resources.
@@ -6,10 +7,13 @@ import { HALLink } from './hal-link.model';
  * A HAL resource has a _links section with at least a self link.
  */
 export class HALResource {
+
   /**
    * The {@link HALLink}s for this {@link HALResource}
    */
+  @deserialize
   _links: {
+
     /**
      * The {@link HALLink} that refers to this {@link HALResource}
      */
@@ -18,6 +22,6 @@ export class HALResource {
     /**
      * {@link HALLink}s to related {@link HALResource}s
      */
-    [k: string]: HALLink;
+    [k: string]: HALLink | HALLink[];
   };
 }
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 7f6cf9fe139..f81b44a0b14 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -1,10 +1,9 @@
 import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
 import { Observable } from 'rxjs/internal/Observable';
 import { isEmpty } from '../../shared/empty.util';
-import { DEFAULT_ENTITY_TYPE } from '../../shared/metadata-representation/metadata-representation.decorator';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { link, typedObject } from '../cache/builders/build-decorators';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { Bundle } from './bundle.model';
 import { BUNDLE } from './bundle.resource-type';
@@ -105,9 +104,9 @@ export class Item extends DSpaceObject implements ChildHALResource {
    * Method that returns as which type of object this object should be rendered
    */
   getRenderTypes(): Array<string | GenericConstructor<ListableObject>> {
-    let entityType = this.firstMetadataValue('relationship.type');
+    const entityType = this.firstMetadataValue('relationship.type');
     if (isEmpty(entityType)) {
-      entityType = DEFAULT_ENTITY_TYPE;
+      return super.getRenderTypes();
     }
     return [entityType, ...super.getRenderTypes()];
   }
diff --git a/src/app/core/shared/metadata.models.ts b/src/app/core/shared/metadata.models.ts
index 085cdb4504f..c29ac3bd2b6 100644
--- a/src/app/core/shared/metadata.models.ts
+++ b/src/app/core/shared/metadata.models.ts
@@ -3,7 +3,7 @@ import { autoserialize, Serialize, Deserialize } from 'cerialize';
 import { hasValue } from '../../shared/empty.util';
 /* tslint:disable:max-classes-per-file */
 
-const VIRTUAL_METADATA_PREFIX = 'virtual::';
+export const VIRTUAL_METADATA_PREFIX = 'virtual::';
 
 /** A single metadata value and its properties. */
 export interface MetadataValueInterface {
diff --git a/src/app/core/shared/operators.spec.ts b/src/app/core/shared/operators.spec.ts
index a19419259d0..4489b02179d 100644
--- a/src/app/core/shared/operators.spec.ts
+++ b/src/app/core/shared/operators.spec.ts
@@ -6,17 +6,14 @@ import { RequestEntry } from '../data/request.reducer';
 import { RequestService } from '../data/request.service';
 import {
   configureRequest,
-  filterSuccessfulResponses,
   getAllSucceededRemoteData,
   getRemoteDataPayload,
   getRequestFromRequestHref,
   getRequestFromRequestUUID,
-  getResourceLinksFromResponse,
   getResponseFromEntry,
-  getSucceededRemoteData, redirectToPageNotFoundOn404
+  getFirstSucceededRemoteData,
+  redirectOn4xx
 } from './operators';
-import { RemoteData } from '../data/remote-data';
-import { RemoteDataError } from '../data/remote-data-error';
 import { of as observableOf } from 'rxjs';
 import {
   createFailedRemoteDataObject,
@@ -117,29 +114,6 @@ describe('Core Module - RxJS Operators', () => {
     });
   });
 
-  describe('filterSuccessfulResponses', () => {
-    it('should only return responses for which isSuccessful === true', () => {
-      const source = hot('abcde', testRCEs);
-      const result = source.pipe(filterSuccessfulResponses());
-      const expected = cold('a--d-', testResponses);
-
-      expect(result).toBeObservable(expected);
-    });
-  });
-
-  describe('getResourceLinksFromResponse', () => {
-    it('should return the resourceSelfLinks for all successful responses', () => {
-      const source = hot('abcde', testRCEs);
-      const result = source.pipe(getResourceLinksFromResponse());
-      const expected = cold('a--d-', {
-        a: testRCEs.a.response.resourceSelfLinks,
-        d: testRCEs.d.response.resourceSelfLinks
-      });
-
-      expect(result).toBeObservable(expected);
-    });
-  });
-
   describe('configureRequest', () => {
     it('should call requestService.configure with the source request', () => {
       requestService = getMockRequestService();
@@ -181,50 +155,84 @@ describe('Core Module - RxJS Operators', () => {
     });
   });
 
-  describe('getSucceededRemoteData', () => {
+  describe('getFirstSucceededRemoteData', () => {
     it('should return the first() hasSucceeded RemoteData Observable', () => {
       const testRD = {
-        a: createSuccessfulRemoteDataObject(undefined),
-        b: createFailedRemoteDataObject( 'b'),
-        c: new RemoteData(false, false, undefined, null, 'c'),
+        a: createFailedRemoteDataObject(),
+        b: createFailedRemoteDataObject(),
+        c: createSuccessfulRemoteDataObject('c'),
         d: createSuccessfulRemoteDataObject('d'),
-        e: createSuccessfulRemoteDataObject('e'),
       };
-      const source = hot('abcde', testRD);
-      const result = source.pipe(getSucceededRemoteData());
+      const source = hot('abcd', testRD);
+      const result = source.pipe(getFirstSucceededRemoteData());
+      const expected = cold('--(c|)', testRD);
 
-      result.subscribe((value) => expect(value)
-        .toEqual(createSuccessfulRemoteDataObject('d')));
+      expect(result).toBeObservable(expected);
 
     });
   });
 
-  describe('redirectToPageNotFoundOn404', () => {
+  describe('redirectOn4xx', () => {
     let router;
+    let authService;
+
     beforeEach(() => {
       router = jasmine.createSpyObj('router', ['navigateByUrl']);
+      authService = jasmine.createSpyObj('authService', {
+        isAuthenticated: observableOf(true),
+        setRedirectUrl: {}
+      });
     });
 
     it('should call navigateByUrl to a 404 page, when the remote data contains a 404 error', () => {
-      const testRD = createFailedRemoteDataObject(undefined, new RemoteDataError(404, 'Not Found', 'Object was not found'));
+      const testRD = createFailedRemoteDataObject('Object was not found', 404);
 
-      observableOf(testRD).pipe(redirectToPageNotFoundOn404(router)).subscribe();
+      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
       expect(router.navigateByUrl).toHaveBeenCalledWith('/404', { skipLocationChange: true });
     });
 
-    it('should not call navigateByUrl to a 404 page, when the remote data contains another error than a 404', () => {
-      const testRD = createFailedRemoteDataObject(undefined, new RemoteDataError(500, 'Server Error', 'Something went wrong'));
+    it('should call navigateByUrl to a 401 page, when the remote data contains a 403 error', () => {
+      const testRD = createFailedRemoteDataObject('Forbidden', 403);
+
+      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
+      expect(router.navigateByUrl).toHaveBeenCalledWith('/403', { skipLocationChange: true });
+    });
+
+    it('should not call navigateByUrl to a 404, 403 or 401 page, when the remote data contains another error than a 404, 403 or 401', () => {
+      const testRD = createFailedRemoteDataObject('Something went wrong', 500);
 
-      observableOf(testRD).pipe(redirectToPageNotFoundOn404(router)).subscribe();
+      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
       expect(router.navigateByUrl).not.toHaveBeenCalled();
     });
 
-    it('should not call navigateByUrl to a 404 page, when the remote data contains no error', () => {
+    it('should not call navigateByUrl to a 404, 403 or 401 page, when the remote data contains no error', () => {
       const testRD = createSuccessfulRemoteDataObject(undefined);
 
-      observableOf(testRD).pipe(redirectToPageNotFoundOn404(router)).subscribe();
+      observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
       expect(router.navigateByUrl).not.toHaveBeenCalled();
     });
+
+    describe('when the user is not authenticated', () => {
+      beforeEach(() => {
+        (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false));
+      });
+
+      it('should set the redirect url and navigate to login when the remote data contains a 401 error', () => {
+        const testRD = createFailedRemoteDataObject('The current user is unauthorized', 401);
+
+        observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
+        expect(authService.setRedirectUrl).toHaveBeenCalled();
+        expect(router.navigateByUrl).toHaveBeenCalledWith('login');
+      });
+
+      it('should set the redirect url and navigate to login when the remote data contains a 403 error', () => {
+        const testRD = createFailedRemoteDataObject('Forbidden', 403);
+
+        observableOf(testRD).pipe(redirectOn4xx(router, authService)).subscribe();
+        expect(authService.setRedirectUrl).toHaveBeenCalled();
+        expect(router.navigateByUrl).toHaveBeenCalledWith('login');
+      });
+    });
   });
 
   describe('getResponseFromEntry', () => {
@@ -246,15 +254,14 @@ describe('Core Module - RxJS Operators', () => {
   describe('getAllSucceededRemoteData', () => {
     it('should return all hasSucceeded RemoteData Observables', () => {
       const testRD = {
-        a: createSuccessfulRemoteDataObject(undefined),
-        b: createFailedRemoteDataObject('b'),
-        c: new RemoteData(false, false, undefined, null, 'c'),
+        a: createFailedRemoteDataObject(),
+        b: createFailedRemoteDataObject(),
+        c: createSuccessfulRemoteDataObject('c'),
         d: createSuccessfulRemoteDataObject('d'),
-        e: createSuccessfulRemoteDataObject('e'),
       };
-      const source = hot('abcde', testRD);
+      const source = hot('abcd', testRD);
       const result = source.pipe(getAllSucceededRemoteData());
-      const expected = cold('---de', testRD);
+      const expected = cold('--cd', testRD);
 
       expect(result).toBeObservable(expected);
 
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index a51e711d265..49b27aec434 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -1,16 +1,20 @@
-import { Router } from '@angular/router';
-import { Observable } from 'rxjs';
-import { filter, find, flatMap, map, take, tap } from 'rxjs/operators';
-import { hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
+import { Router, UrlTree } from '@angular/router';
+import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
+import { filter, find, flatMap, map, switchMap, take, tap, takeWhile } from 'rxjs/operators';
+import { hasValue, hasValueOperator, isNotEmpty, hasNoValue } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/search-result.model';
-import { DSOSuccessResponse, RestResponse } from '../cache/response.models';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RestRequest } from '../data/request.models';
-import { RequestEntry } from '../data/request.reducer';
+import { RequestEntry, ResponseState } from '../data/request.reducer';
 import { RequestService } from '../data/request.service';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
+import { getForbiddenRoute, getPageNotFoundRoute } from '../../app-routing-paths';
+import { getEndUserAgreementPath } from '../../info/info-routing-paths';
+import { AuthService } from '../auth/auth.service';
 
 /**
  * This file contains custom RxJS operators that can be used in multiple places
@@ -30,27 +34,13 @@ export const getRequestFromRequestUUID = (requestService: RequestService) =>
       hasValueOperator()
     );
 
-export const filterSuccessfulResponses = () =>
-  (source: Observable<RequestEntry>): Observable<RestResponse> =>
-    source.pipe(
-      getResponseFromEntry(),
-      filter((response: RestResponse) => response.isSuccessful === true),
-    );
-
 export const getResponseFromEntry = () =>
-  (source: Observable<RequestEntry>): Observable<RestResponse> =>
+  (source: Observable<RequestEntry>): Observable<ResponseState> =>
     source.pipe(
       filter((entry: RequestEntry) => hasValue(entry) && hasValue(entry.response)),
       map((entry: RequestEntry) => entry.response)
     );
 
-export const getResourceLinksFromResponse = () =>
-  (source: Observable<RequestEntry>): Observable<string[]> =>
-    source.pipe(
-      filterSuccessfulResponses(),
-      map((response: DSOSuccessResponse) => response.resourceSelfLinks),
-    );
-
 export const configureRequest = (requestService: RequestService) =>
   (source: Observable<RestRequest>): Observable<RestRequest> =>
     source.pipe(tap((request: RestRequest) => requestService.configure(request)));
@@ -63,9 +53,25 @@ export const getPaginatedListPayload = () =>
   <T>(source: Observable<PaginatedList<T>>): Observable<T[]> =>
     source.pipe(map((list: PaginatedList<T>) => list.page));
 
-export const getSucceededRemoteData = () =>
+export const getAllCompletedRemoteData = () =>
+  <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
+    source.pipe(filter((rd: RemoteData<T>) => hasValue(rd) && rd.hasCompleted));
+
+export const getFirstCompletedRemoteData = () =>
+  <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
+    source.pipe(getAllCompletedRemoteData(), take(1));
+
+export const takeUntilCompletedRemoteData = () =>
+  <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
+    source.pipe(takeWhile((rd: RemoteData<T>) => hasNoValue(rd) || rd.isLoading, true));
+
+export const getFirstSucceededRemoteData = () =>
   <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
-    source.pipe(find((rd: RemoteData<T>) => rd.hasSucceeded));
+    source.pipe(filter((rd: RemoteData<T>) => rd.hasSucceeded), take(1));
+
+export const getFirstSucceededRemoteWithNotEmptyData = () =>
+  <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
+    source.pipe(find((rd: RemoteData<T>) => rd.hasSucceeded && isNotEmpty(rd.payload)));
 
 /**
  * Get the first successful remotely retrieved object
@@ -80,7 +86,24 @@ export const getSucceededRemoteData = () =>
 export const getFirstSucceededRemoteDataPayload = () =>
   <T>(source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload()
+    );
+
+/**
+ * Get the first successful remotely retrieved object with not empty payload
+ *
+ * You usually don't want to use this, it is a code smell.
+ * Work with the RemoteData object instead, that way you can
+ * handle loading and errors correctly.
+ *
+ * These operators were created as a first step in refactoring
+ * out all the instances where this is used incorrectly.
+ */
+export const getFirstSucceededRemoteDataWithNotEmptyPayload = () =>
+  <T>(source: Observable<RemoteData<T>>): Observable<T> =>
+    source.pipe(
+      getFirstSucceededRemoteWithNotEmptyData(),
       getRemoteDataPayload()
     );
 
@@ -118,7 +141,7 @@ export const getAllSucceededRemoteDataPayload = () =>
 export const getFirstSucceededRemoteListPayload = () =>
   <T>(source: Observable<RemoteData<PaginatedList<T>>>): Observable<T[]> =>
     source.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       getPaginatedListPayload()
     );
@@ -146,19 +169,66 @@ export const getAllSucceededRemoteListPayload = () =>
     );
 
 /**
- * Operator that checks if a remote data object contains a page not found error
- * When it does contain such an error, it will redirect the user to a page not found, without altering the current URL
+ * Operator that checks if a remote data object returned a 401 or 404 error
+ * When it does contain such an error, it will redirect the user to the related error page, without altering the current URL
  * @param router The router used to navigate to a new page
+ * @param authService Service to check if the user is authenticated
  */
-export const redirectToPageNotFoundOn404 = (router: Router) =>
+export const redirectOn4xx = (router: Router, authService: AuthService) =>
   <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
-    source.pipe(
-      tap((rd: RemoteData<T>) => {
-        if (rd.hasFailed && rd.error.statusCode === 404) {
-          router.navigateByUrl('/404', { skipLocationChange: true });
+    observableCombineLatest(source, authService.isAuthenticated()).pipe(
+      map(([rd, isAuthenticated]: [RemoteData<T>, boolean]) => {
+        if (rd.hasFailed) {
+          if (rd.statusCode === 404) {
+            router.navigateByUrl(getPageNotFoundRoute(), {skipLocationChange: true});
+          } else if (rd.statusCode === 403 || rd.statusCode === 401) {
+            if (isAuthenticated) {
+              router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
+            } else {
+              authService.setRedirectUrl(router.url);
+              router.navigateByUrl('login');
+            }
+          }
+        }
+        return rd;
+      }));
+
+/**
+ * Operator that returns a UrlTree to a forbidden page or the login page when the boolean received is false
+ * @param router      The router used to navigate to a forbidden page
+ * @param authService The AuthService used to determine whether or not the user is logged in
+ * @param redirectUrl The URL to redirect back to after logging in
+ */
+export const returnForbiddenUrlTreeOrLoginOnFalse = (router: Router, authService: AuthService, redirectUrl: string) =>
+  (source: Observable<boolean>): Observable<boolean | UrlTree> =>
+    observableCombineLatest(source, authService.isAuthenticated()).pipe(
+      map(([authorized, authenticated]: [boolean, boolean]) => {
+        if (authorized) {
+          return authorized;
+        } else {
+          if (authenticated) {
+            return router.parseUrl(getForbiddenRoute());
+          } else {
+            authService.setRedirectUrl(redirectUrl);
+            return router.parseUrl('login');
+          }
         }
       }));
 
+/**
+ * Operator that returns a UrlTree to the unauthorized page when the boolean received is false
+ * @param router    Router
+ * @param redirect  Redirect URL to add to the UrlTree. This is used to redirect back to the original route after the
+ *                  user accepts the agreement.
+ */
+export const returnEndUserAgreementUrlTreeOnFalse = (router: Router, redirect: string) =>
+  (source: Observable<boolean>): Observable<boolean | UrlTree> =>
+    source.pipe(
+      map((hasAgreed: boolean) => {
+        const queryParams = { redirect: encodeURIComponent(redirect) };
+        return hasAgreed ? hasAgreed : router.createUrlTree([getEndUserAgreementPath()], { queryParams });
+      }));
+
 export const getFinishedRemoteData = () =>
   <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
     source.pipe(find((rd: RemoteData<T>) => !rd.isLoading));
@@ -184,9 +254,10 @@ export const toDSpaceObjectListRD = () =>
  * @returns {(source: Observable<RemoteData<BrowseDefinition[]>>) => Observable<any>}
  */
 export const getBrowseDefinitionLinks = (definitionID: string) =>
-  (source: Observable<RemoteData<BrowseDefinition[]>>): Observable<any> =>
+  (source: Observable<RemoteData<PaginatedList<BrowseDefinition>>>): Observable<any> =>
     source.pipe(
       getRemoteDataPayload(),
+      getPaginatedListPayload(),
       map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
         .find((def: BrowseDefinition) => def.id === definitionID)
       ),
@@ -217,3 +288,27 @@ export const paginatedListToArray = () =>
       hasValueOperator(),
       map((objectRD: RemoteData<PaginatedList<T>>) => objectRD.payload.page.filter((object: T) => hasValue(object)))
     );
+
+/**
+ * Operator for turning a list of metadata fields into an array of string representing their schema.element.qualifier string
+ */
+export const metadataFieldsToString = () =>
+  (source: Observable<RemoteData<PaginatedList<MetadataField>>>): Observable<string[]> =>
+    source.pipe(
+      hasValueOperator(),
+      map((fieldRD: RemoteData<PaginatedList<MetadataField>>) => {
+        return fieldRD.payload.page.filter((object: MetadataField) => hasValue(object))
+      }),
+      switchMap((fields: MetadataField[]) => {
+        const fieldSchemaArray = fields.map((field: MetadataField) => {
+          return field.schema.pipe(
+            getFirstSucceededRemoteDataPayload(),
+            map((schema: MetadataSchema) => ({ field, schema }))
+          );
+        });
+        return observableCombineLatest(fieldSchemaArray);
+      }),
+      map((fieldSchemaArray: Array<{ field: MetadataField, schema: MetadataSchema }>): string[] => {
+        return fieldSchemaArray.map((fieldSchema: { field: MetadataField, schema: MetadataSchema }) => fieldSchema.schema.prefix + '.' + fieldSchema.field.toString())
+      })
+    );
diff --git a/src/app/core/shared/process-output.resource-type.ts b/src/app/core/shared/process-output.resource-type.ts
new file mode 100644
index 00000000000..2e707d0bdad
--- /dev/null
+++ b/src/app/core/shared/process-output.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from './resource-type';
+
+/**
+ * The resource type for ProcessOutput
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const PROCESS_OUTPUT_TYPE = new ResourceType('processOutput');
diff --git a/src/app/core/shared/registration.model.ts b/src/app/core/shared/registration.model.ts
new file mode 100644
index 00000000000..55eec7c75a1
--- /dev/null
+++ b/src/app/core/shared/registration.model.ts
@@ -0,0 +1,29 @@
+import { typedObject } from '../cache/builders/build-decorators';
+import { ResourceType } from './resource-type';
+import { REGISTRATION } from './registration.resource-type';
+import { UnCacheableObject } from './uncacheable-object.model';
+
+@typedObject
+export class Registration implements UnCacheableObject {
+  static type = REGISTRATION
+  /**
+   * The object type
+   */
+  type: ResourceType;
+
+  /**
+   * The email linked to the registration
+   */
+  email: string;
+
+  /**
+   * The user linked to the registration
+   */
+  user: string;
+
+  /**
+   * The token linked to the registration
+   */
+  token: string;
+
+}
diff --git a/src/app/core/shared/registration.resource-type.ts b/src/app/core/shared/registration.resource-type.ts
new file mode 100644
index 00000000000..05f6e9074ca
--- /dev/null
+++ b/src/app/core/shared/registration.resource-type.ts
@@ -0,0 +1,3 @@
+import { ResourceType } from './resource-type';
+
+export const REGISTRATION = new ResourceType('registration');
diff --git a/src/app/core/shared/resource-policy.model.ts b/src/app/core/shared/resource-policy.model.ts
deleted file mode 100644
index dd00a16e973..00000000000
--- a/src/app/core/shared/resource-policy.model.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
-import { typedObject } from '../cache/builders/build-decorators';
-import { IDToUUIDSerializer } from '../cache/id-to-uuid-serializer';
-import { ActionType } from '../cache/models/action-type.model';
-import { CacheableObject } from '../cache/object-cache.reducer';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { HALLink } from './hal-link.model';
-import { RESOURCE_POLICY } from './resource-policy.resource-type';
-import { ResourceType } from './resource-type';
-
-/**
- * Model class for a Resource Policy
- */
-@typedObject
-export class ResourcePolicy implements CacheableObject {
-  static type = RESOURCE_POLICY;
-
-  /**
-   * The object type
-   */
-  @excludeFromEquals
-  @autoserialize
-  type: ResourceType;
-
-  /**
-   * The action that is allowed by this Resource Policy
-   */
-  @autoserialize
-  action: ActionType;
-
-  /**
-   * The name for this Resource Policy
-   */
-  @autoserialize
-  name: string;
-
-  /**
-   * The uuid of the Group this Resource Policy applies to
-   */
-  @autoserialize
-  groupUUID: string;
-
-  /**
-   * The universally unique identifier for this Resource Policy
-   * This UUID is generated client-side and isn't used by the backend.
-   * It is based on the ID, so it will be the same for each refresh.
-   */
-  @deserializeAs(new IDToUUIDSerializer('resource-policy'), 'id')
-  uuid: string;
-
-  /**
-   * The {@link HALLink}s for this ResourcePolicy
-   */
-  @deserialize
-  _links: {
-    self: HALLink,
-  }
-}
diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index c2bb5082c79..3c938e29f8e 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -11,7 +11,7 @@ import { RemoteData } from '../../data/remote-data';
 import { DSpaceObjectType } from '../dspace-object-type.model';
 import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
 import { RouteService } from '../../services/route.service';
-import { getSucceededRemoteData } from '../operators';
+import { getFirstSucceededRemoteData } from '../operators';
 import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
@@ -85,7 +85,7 @@ export class SearchConfigurationService implements OnDestroy {
    */
   protected initDefaults() {
     this.defaults
-      .pipe(getSucceededRemoteData())
+      .pipe(getFirstSucceededRemoteData())
       .subscribe((defRD: RemoteData<PaginatedSearchOptions>) => {
           const defs = defRD.payload;
           this.paginatedSearchOptions = new BehaviorSubject<PaginatedSearchOptions>(defs);
@@ -263,7 +263,7 @@ export class SearchConfigurationService implements OnDestroy {
         scope: this.defaultScope,
         query: this.defaultQuery
       });
-      this._defaults = createSuccessfulRemoteDataObject$(options);
+      this._defaults = createSuccessfulRemoteDataObject$(options, new Date().getTime());
     }
     return this._defaults;
   }
diff --git a/src/app/core/shared/search/search-filter.service.spec.ts b/src/app/core/shared/search/search-filter.service.spec.ts
index 04fa4fbce08..045b2b17c94 100644
--- a/src/app/core/shared/search/search-filter.service.spec.ts
+++ b/src/app/core/shared/search/search-filter.service.spec.ts
@@ -21,7 +21,7 @@ describe('SearchFilterService', () => {
   const filterName1 = 'test name';
   const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
-    type: FilterType.text,
+    filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index 816d90cb2bd..5f5e4aa8b18 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -1,9 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
-
 import { SearchService } from './search.service';
 import { Router, UrlTree } from '@angular/router';
 import { RequestService } from '../../data/request.service';
@@ -15,9 +13,6 @@ import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-
 import { RemoteData } from '../../data/remote-data';
 import { RequestEntry } from '../../data/request.reducer';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { FacetConfigSuccessResponse, SearchSuccessResponse } from '../../cache/response.models';
-import { SearchQueryResponse } from '../../../shared/search/search-query-response.model';
-import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
 import { CommunityDataService } from '../../data/community-data.service';
 import { ViewMode } from '../view-mode.model';
 import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
@@ -26,6 +21,7 @@ import { RouteService } from '../../services/route.service';
 import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { SearchObjects } from '../../../shared/search/search-objects.model';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -90,6 +86,11 @@ describe('SearchService', () => {
       },
       aggregate: (input: Array<Observable<RemoteData<any>>>): Observable<RemoteData<any[]>> => {
         return createSuccessfulRemoteDataObject$([]);
+      },
+      buildFromHref: (href: string): Observable<RemoteData<any>> => {
+        return createSuccessfulRemoteDataObject$(Object.assign(new SearchObjects(), {
+          page: []
+        }))
       }
     };
 
@@ -159,10 +160,9 @@ describe('SearchService', () => {
     describe('when search is called', () => {
       const endPoint = 'http://endpoint.com/test/test';
       const searchOptions = new PaginatedSearchOptions({});
-      const queryResponse = Object.assign(new SearchQueryResponse(), { objects: [] });
-      const response = new SearchSuccessResponse(queryResponse, 200, 'OK');
       beforeEach(() => {
         spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
+        spyOn((searchService as any).rdb, 'buildFromHref').and.callThrough();
         /* tslint:disable:no-empty */
         searchService.search(searchOptions).subscribe((t) => {
         }); // subscribe to make sure all methods are called
@@ -178,16 +178,15 @@ describe('SearchService', () => {
       });
 
       it('should call getByHref on the request service with the correct request url', () => {
-        expect((searchService as any).requestService.getByHref).toHaveBeenCalledWith(endPoint);
+        expect((searchService as any).rdb.buildFromHref).toHaveBeenCalledWith(endPoint);
       });
     });
 
     describe('when getConfig is called without a scope', () => {
       const endPoint = 'http://endpoint.com/test/config';
-      const filterConfig = [new SearchFilterConfig()];
-      const response = new FacetConfigSuccessResponse(filterConfig,  200, 'OK');
       beforeEach(() => {
         spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
+        spyOn((searchService as any).rdb, 'buildFromHref').and.callThrough();
         /* tslint:disable:no-empty */
         searchService.getConfig(null).subscribe((t) => {
         }); // subscribe to make sure all methods are called
@@ -202,8 +201,8 @@ describe('SearchService', () => {
         expect((searchService as any).requestService.configure).toHaveBeenCalled();
       });
 
-      it('should call getByHref on the request service with the correct request url', () => {
-        expect((searchService as any).requestService.getByHref).toHaveBeenCalledWith(endPoint);
+      it('should call configure containing a request with the correct request url', () => {
+        expect((searchService as any).requestService.configure).toHaveBeenCalledWith(jasmine.objectContaining({ href: endPoint }));
       });
     });
 
@@ -211,8 +210,6 @@ describe('SearchService', () => {
       const endPoint = 'http://endpoint.com/test/config';
       const scope = 'test';
       const requestUrl = endPoint + '?scope=' + scope;
-      const filterConfig = [new SearchFilterConfig()];
-      const response = new FacetConfigSuccessResponse(filterConfig, 200, 'OK');
       beforeEach(() => {
         spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
         /* tslint:disable:no-empty */
@@ -229,8 +226,8 @@ describe('SearchService', () => {
         expect((searchService as any).requestService.configure).toHaveBeenCalled();
       });
 
-      it('should call getByHref on the request service with the correct request url', () => {
-        expect((searchService as any).requestService.getByHref).toHaveBeenCalledWith(requestUrl);
+      it('should call configure containing a request with the correct request url', () => {
+        expect((searchService as any).requestService.configure).toHaveBeenCalledWith(jasmine.objectContaining({ href: requestUrl }));
       });
     });
   });
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index 06dfd6dba0b..d8a7b420c92 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -1,11 +1,10 @@
 import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { Injectable, OnDestroy } from '@angular/core';
 import { NavigationExtras, Router } from '@angular/router';
-import { first, map, switchMap, tap } from 'rxjs/operators';
+import { first, map, switchMap, take } from 'rxjs/operators';
 import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { LinkService } from '../../cache/builders/link.service';
-import { FacetConfigSuccessResponse, FacetValueSuccessResponse, SearchSuccessResponse } from '../../cache/response.models';
-import { PaginatedList } from '../../data/paginated-list';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { ResponseParsingService } from '../../data/parsing.service';
 import { RemoteData } from '../../data/remote-data';
 import { GetRequest, RestRequest } from '../../data/request.models';
@@ -14,16 +13,11 @@ import { DSpaceObject } from '../dspace-object.model';
 import { GenericConstructor } from '../generic-constructor';
 import { HALEndpointService } from '../hal-endpoint.service';
 import { URLCombiner } from '../../url-combiner/url-combiner';
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../../shared/empty.util';
+import { hasValue, isEmpty, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
 import { SearchOptions } from '../../../shared/search/search-options.model';
-import { SearchResult } from '../../../shared/search/search-result.model';
-import { FacetValue } from '../../../shared/search/facet-value.model';
 import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
 import { SearchResponseParsingService } from '../../data/search-response-parsing.service';
-import { SearchQueryResponse } from '../../../shared/search/search-query-response.model';
-import { PageInfo } from '../page-info.model';
-import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { SearchObjects } from '../../../shared/search/search-objects.model';
 import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
 import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service';
 import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
@@ -32,9 +26,17 @@ import { CommunityDataService } from '../../data/community-data.service';
 import { ViewMode } from '../view-mode.model';
 import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { configureRequest, filterSuccessfulResponses, getResponseFromEntry, getSucceededRemoteData } from '../operators';
+import {
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload
+} from '../operators';
 import { RouteService } from '../../services/route.service';
-import { RequestEntry } from '../../data/request.reducer';
+import { SearchResult } from '../../../shared/search/search-result.model';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
+import { FacetConfigResponse } from '../../../shared/search/facet-config-response.model';
+import { FacetValues } from '../../../shared/search/facet-values.model';
 
 /**
  * Service that performs all general actions that have to do with the search page
@@ -108,116 +110,108 @@ export class SearchService implements OnDestroy {
    * @param {PaginatedSearchOptions} searchOptions The configuration necessary to perform this search
    * @param responseMsToLive The amount of milliseconds for the response to live in cache
    * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   * @returns {Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>>} Emits a paginated list with all search results found
+   * @returns {Observable<RemoteData<SearchObjects<T>>>} Emits a paginated list with all search results found
    */
-  search<T extends DSpaceObject>(searchOptions?: PaginatedSearchOptions, responseMsToLive?: number, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
-    return this.getPaginatedResults<T>(this.searchEntries(searchOptions), ...linksToFollow);
-  }
+  search<T extends DSpaceObject>(searchOptions?: PaginatedSearchOptions, responseMsToLive?: number, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<SearchObjects<T>>> {
+    const href$ = this.getEndpoint(searchOptions);
 
-  /**
-   * Method to retrieve request entries for search results from the server
-   * @param {PaginatedSearchOptions} searchOptions The configuration necessary to perform this search
-   * @param responseMsToLive The amount of milliseconds for the response to live in cache
-   * @returns {Observable<RequestEntry>} Emits an observable with the request entries
-   */
-  searchEntries(searchOptions?: PaginatedSearchOptions, responseMsToLive?: number): Observable<{searchOptions: PaginatedSearchOptions, requestEntry: RequestEntry}> {
+    href$.pipe(take(1)).subscribe((url: string) => {
+      const request = new this.request(this.requestService.generateRequestId(), url);
 
-    const hrefObs = this.getEndpoint(searchOptions);
+      const getResponseParserFn: () => GenericConstructor<ResponseParsingService> = () => {
+        return this.parser;
+      };
 
-    const requestObs = hrefObs.pipe(
-      map((url: string) => {
-        const request = new this.request(this.requestService.generateRequestId(), url);
+      Object.assign(request, {
+        responseMsToLive: hasValue(responseMsToLive) ? responseMsToLive : request.responseMsToLive,
+        getResponseParser: getResponseParserFn,
+        searchOptions: searchOptions
+      });
 
-        const getResponseParserFn: () => GenericConstructor<ResponseParsingService> = () => {
-          return this.parser;
-        };
+      this.requestService.configure(request);
+    });
 
-        return Object.assign(request, {
-          responseMsToLive: hasValue(responseMsToLive) ? responseMsToLive : request.responseMsToLive,
-          getResponseParser: getResponseParserFn,
-          searchOptions: searchOptions
-        });
-      }),
-      configureRequest(this.requestService),
-    );
-    return requestObs.pipe(
-      switchMap((request: RestRequest) => this.requestService.getByHref(request.href)),
-      map(((requestEntry: RequestEntry) => ({
-        searchOptions: searchOptions,
-        requestEntry: requestEntry
-      })))
+    const sqr$ = href$.pipe(
+      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href))
     );
-  }
+
+    return this.directlyAttachIndexableObjects(sqr$);
+ }
 
   /**
-   * Method to convert the parsed responses into a paginated list of search results
-   * @param searchEntries: The request entries from the search method
-   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   * @returns {Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>>} Emits a paginated list with all search results found
+   * Method to retrieve request entries for search results from the server
+   * @param {PaginatedSearchOptions} searchOptions The configuration necessary to perform this search
+   * @returns {Observable<RemoteData<SearchObjects<T>>>} Emits a paginated list with all search results found
    */
-  getPaginatedResults<T extends DSpaceObject>(searchEntries: Observable<{ searchOptions: PaginatedSearchOptions, requestEntry: RequestEntry }>, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
-    const requestEntryObs: Observable<RequestEntry> = searchEntries.pipe(
-      map((entry) => entry.requestEntry),
-    );
-
-    // get search results from response cache
-    const sqrObs: Observable<SearchQueryResponse> = requestEntryObs.pipe(
-      filterSuccessfulResponses(),
-      map((response: SearchSuccessResponse) => response.results),
-    );
-
-    // turn dspace href from search results to effective list of DSpaceObjects
-    // Turn list of observable remote data DSO's into observable remote data object with list of DSO
-    const dsoObs: Observable<RemoteData<DSpaceObject[]>> = sqrObs.pipe(
-      map((sqr: SearchQueryResponse) => {
-        return sqr.objects
-          .filter((sr: SearchResult<DSpaceObject>) => isNotUndefined(sr._links.indexableObject))
-          .map((sr: SearchResult<DSpaceObject>) => new GetRequest(this.requestService.generateRequestId(), sr._links.indexableObject.href))
-      }),
-      // Send a request for each item to ensure fresh cache
-      tap((reqs: RestRequest[]) => reqs.forEach((req: RestRequest) => this.requestService.configure(req))),
-      map((reqs: RestRequest[]) => reqs.map((req: RestRequest) => this.rdb.buildSingle(req.href, ...linksToFollow))),
-      switchMap((input: Array<Observable<RemoteData<DSpaceObject>>>) => this.rdb.aggregate(input)),
-    );
+  searchEntries<T extends DSpaceObject>(searchOptions?: PaginatedSearchOptions): Observable<RemoteData<SearchObjects<T>>> {
+    const href$ = this.getEndpoint(searchOptions);
 
-    // Create search results again with the correct dso objects linked to each result
-    const tDomainListObs = observableCombineLatest(sqrObs, dsoObs).pipe(
-      map(([sqr, dsos]) => {
-        return sqr.objects.map((object: SearchResult<DSpaceObject>, index: number) => {
-          let co = DSpaceObject;
-          if (dsos.payload[index]) {
-            const constructor: GenericConstructor<ListableObject> = dsos.payload[index].constructor as GenericConstructor<ListableObject>;
-            co = getSearchResultFor(constructor);
-            return Object.assign(new co(), object, {
-              indexableObject: dsos.payload[index]
-            });
-          } else {
-            return undefined;
-          }
-        });
-      })
+    const sqr$ = href$.pipe(
+      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href))
     );
 
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: FacetValueSuccessResponse) => response.pageInfo)
-    );
-
-    const payloadObs = observableCombineLatest(tDomainListObs, pageInfoObs).pipe(
-      map(([tDomainList, pageInfo]) => {
-        return new PaginatedList(pageInfo, tDomainList.filter((obj) => hasValue(obj)));
-      })
-    );
+    return this.directlyAttachIndexableObjects(sqr$);
+  }
 
-    return observableCombineLatest(tDomainListObs, searchEntries).pipe(
-      switchMap(([tDomainList, searchEntry]) => {
-        const requestEntry = searchEntry.requestEntry;
-        if (tDomainList.indexOf(undefined) > -1 && requestEntry && requestEntry.completed) {
-          this.requestService.removeByHrefSubstring(requestEntry.request.href);
-          return this.search(searchEntry.searchOptions)
-        } else {
-          return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
+  /**
+   * Method to directly attach the indexableObjects to search results, instead of using RemoteData.
+   * For compatibility with the way the search was written originally
+   *
+   * @param sqr$:         a SearchObjects RemotaData Observable without its indexableObjects
+   *                      attached
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s on
+   *                      the indexableObjects should be automatically resolved
+   * @protected
+   */
+  protected directlyAttachIndexableObjects<T extends DSpaceObject>(sqr$: Observable<RemoteData<SearchObjects<T>>>, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<RemoteData<SearchObjects<T>>> {
+    return sqr$.pipe(
+      switchMap((resultsRd: RemoteData<SearchObjects<T>>) => {
+        if (hasValue(resultsRd.payload) && isNotEmpty(resultsRd.payload.page)) {
+          // retrieve the indexableObjects for all search results on the page
+          const searchResult$Array: Array<Observable<SearchResult<T>>> = resultsRd.payload.page.map((result: SearchResult<T>) =>
+            this.dspaceObjectService.findByHref(result._links.indexableObject.href, true, ...linksToFollow as any).pipe(
+              getFirstCompletedRemoteData(),
+              getRemoteDataPayload(),
+              hasValueOperator(),
+              map((indexableObject: DSpaceObject) => {
+                // determine the constructor of the search result (ItemSearchResult,
+                // CollectionSearchResult, etc) based on the kind of the indeaxbleObject it
+                // contains. Recreate the result with that constructor
+                const constructor: GenericConstructor<ListableObject> = indexableObject.constructor as GenericConstructor<ListableObject>;
+                const resultConstructor = getSearchResultFor(constructor);
+
+                // Attach the payload directly to the indexableObject property on the result
+                return Object.assign(new resultConstructor(), result, {
+                  indexableObject
+                }) as SearchResult<T>;
+              }),
+            )
+          );
+
+          // Swap the original page in the remoteData with the new one, now that the results have the
+          // correct types, and all indexableObjects are directly attached.
+          return observableCombineLatest(searchResult$Array).pipe(
+            map((page: Array<SearchResult<T>>) => {
+
+              const payload = Object.assign(new SearchObjects(), resultsRd.payload, {
+                page
+              }) as SearchObjects<T>;
+
+              return new RemoteData(
+                resultsRd.timeCompleted,
+                resultsRd.msToLive,
+                resultsRd.lastUpdated,
+                resultsRd.state,
+                resultsRd.errorMessage,
+                payload,
+                resultsRd.statusCode,
+              )
+            })
+          )
         }
+        // If we don't have a payload, or the page is empty, simply pass on the unmodified
+        // RemoteData object
+        return [resultsRd];
       })
     );
   }
@@ -229,7 +223,7 @@ export class SearchService implements OnDestroy {
    * @returns {Observable<RemoteData<SearchFilterConfig[]>>} The found filter configuration
    */
   getConfig(scope?: string, configurationName?: string): Observable<RemoteData<SearchFilterConfig[]>> {
-    const requestObs = this.halService.getEndpoint(this.facetLinkPathPrefix).pipe(
+    const href$ = this.halService.getEndpoint(this.facetLinkPathPrefix).pipe(
       map((url: string) => {
         const args: string[] = [];
 
@@ -245,28 +239,37 @@ export class SearchService implements OnDestroy {
           url = new URLCombiner(url, `?${args.join('&')}`).toString();
         }
 
-        const request = new this.request(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
+        return url;
+      }),
+    );
+
+    href$.pipe(take(1)).subscribe((url: string) => {
+        let request = new this.request(this.requestService.generateRequestId(), url);
+        request = Object.assign(request, {
           getResponseParser(): GenericConstructor<ResponseParsingService> {
             return FacetConfigResponseParsingService;
           }
         });
-      }),
-      configureRequest(this.requestService)
-    );
-
-    const requestEntryObs = requestObs.pipe(
-      switchMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    // get search results from response cache
-    const facetConfigObs: Observable<SearchFilterConfig[]> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: FacetConfigSuccessResponse) =>
-        response.results.map((result: any) => Object.assign(new SearchFilterConfig(), result)))
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, facetConfigObs);
+        this.requestService.configure(request);
+    });
+
+    return this.rdb.buildFromHref(href$).pipe(
+      map((rd: RemoteData<FacetConfigResponse>) => {
+        if (rd.hasSucceeded) {
+          return new RemoteData(
+            rd.timeCompleted,
+            rd.msToLive,
+            rd.lastUpdated,
+            rd.state,
+            rd.errorMessage,
+            rd.payload.filters,
+            rd.statusCode,
+          );
+        } else {
+          return rd as any as RemoteData<SearchFilterConfig[]>;
+        }
+      })
+    )
   }
 
   /**
@@ -277,50 +280,27 @@ export class SearchService implements OnDestroy {
    * @param {string} filterQuery The optional query used to filter out filter values
    * @returns {Observable<RemoteData<PaginatedList<FacetValue>>>} Emits the given page of facet values
    */
-  getFacetValuesFor(filterConfig: SearchFilterConfig, valuePage: number, searchOptions?: SearchOptions, filterQuery?: string): Observable<RemoteData<PaginatedList<FacetValue>>> {
-    const requestObs = this.halService.getEndpoint(this.facetLinkPathPrefix + filterConfig.name).pipe(
-      map((url: string) => {
-        const args: string[] = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`];
-        if (hasValue(filterQuery)) {
-          args.push(`prefix=${filterQuery}`);
-        }
-        if (hasValue(searchOptions)) {
-          url = searchOptions.toRestUrl(url, args);
-        }
-
-        const request = new this.request(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
-          getResponseParser(): GenericConstructor<ResponseParsingService> {
-            return FacetValueResponseParsingService;
-          }
-        });
-      }),
-      configureRequest(this.requestService),
-      first()
-    );
-
-    const requestEntryObs = requestObs.pipe(
-      switchMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    // get search results from response cache
-    const facetValueObs: Observable<FacetValue[]> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: FacetValueSuccessResponse) => response.results)
-    );
-
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: FacetValueSuccessResponse) => response.pageInfo)
-    );
+  getFacetValuesFor(filterConfig: SearchFilterConfig, valuePage: number, searchOptions?: SearchOptions, filterQuery?: string): Observable<RemoteData<FacetValues>> {
+    let href;
+    const args: string[] = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`];
+    if (hasValue(filterQuery)) {
+      args.push(`prefix=${filterQuery}`);
+    }
+    if (hasValue(searchOptions)) {
+      href = searchOptions.toRestUrl(filterConfig._links.self.href, args);
+    } else {
+      href = new URLCombiner(filterConfig._links.self.href, `?${args.join('&')}`).toString();
+    }
 
-    const payloadObs = observableCombineLatest(facetValueObs, pageInfoObs).pipe(
-      map(([facetValue, pageInfo]) => {
-        return new PaginatedList(pageInfo, facetValue);
-      })
-    );
+    let request = new this.request(this.requestService.generateRequestId(), href);
+    request = Object.assign(request, {
+      getResponseParser(): GenericConstructor<ResponseParsingService> {
+        return FacetValueResponseParsingService;
+      }
+    });
+    this.requestService.configure(request);
 
-    return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
+    return this.rdb.buildFromHref(href);
   }
 
   /**
@@ -332,6 +312,7 @@ export class SearchService implements OnDestroy {
 
     if (isEmpty(scopeId)) {
       const top: Observable<Community[]> = this.communityService.findTop({ elementsPerPage: 9999 }).pipe(
+        getFirstSucceededRemoteData(),
         map(
           (communities: RemoteData<PaginatedList<Community>>) => communities.payload.page
         )
@@ -339,13 +320,16 @@ export class SearchService implements OnDestroy {
       return top;
     }
 
-    const scopeObject: Observable<RemoteData<DSpaceObject>> = this.dspaceObjectService.findById(scopeId).pipe(getSucceededRemoteData());
+    const scopeObject: Observable<RemoteData<DSpaceObject>> = this.dspaceObjectService.findById(scopeId).pipe(getFirstSucceededRemoteData());
     const scopeList: Observable<DSpaceObject[]> = scopeObject.pipe(
       switchMap((dsoRD: RemoteData<DSpaceObject>) => {
           if ((dsoRD.payload as any).type === Community.type.value) {
             const community: Community = dsoRD.payload as Community;
             this.linkService.resolveLinks(community, followLink('subcommunities'), followLink('collections'));
-            return observableCombineLatest(community.subcommunities, community.collections).pipe(
+            return observableCombineLatest([
+              community.subcommunities.pipe(getFirstCompletedRemoteData()),
+              community.collections.pipe(getFirstCompletedRemoteData())
+            ]).pipe(
               map(([subCommunities, collections]) => {
                 /*if this is a community, we also need to show the direct children*/
                 return [community, ...subCommunities.payload.page, ...collections.payload.page]
diff --git a/src/app/core/shared/template-item.model.ts b/src/app/core/shared/template-item.model.ts
new file mode 100644
index 00000000000..bfcf941e413
--- /dev/null
+++ b/src/app/core/shared/template-item.model.ts
@@ -0,0 +1,24 @@
+import { inheritSerialization } from 'cerialize';
+import { Item } from './item.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../data/remote-data';
+import { Collection } from './collection.model';
+import { ITEM_TEMPLATE } from './template-item.resource-type';
+import { link, typedObject } from '../cache/builders/build-decorators';
+import { COLLECTION } from './collection.resource-type';
+
+/**
+ * Class representing a DSpace Template Item
+ */
+@typedObject
+@inheritSerialization(Item)
+export class TemplateItem extends Item {
+  static type = ITEM_TEMPLATE;
+
+  /**
+   * The Collection that this item is a template for
+   */
+  @link(COLLECTION)
+  templateItemOf: Observable<RemoteData<Collection>>;
+
+}
diff --git a/src/app/core/shared/template-item.resource-type.ts b/src/app/core/shared/template-item.resource-type.ts
new file mode 100644
index 00000000000..06692d8cc77
--- /dev/null
+++ b/src/app/core/shared/template-item.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from './resource-type';
+
+/**
+ * The resource type for TemplateItem.
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ITEM_TEMPLATE = new ResourceType('itemtemplate');
diff --git a/src/app/core/shared/uncacheable-object.model.ts b/src/app/core/shared/uncacheable-object.model.ts
new file mode 100644
index 00000000000..88e057aaa5d
--- /dev/null
+++ b/src/app/core/shared/uncacheable-object.model.ts
@@ -0,0 +1,11 @@
+/**
+ * An interface to represent objects returned by the REST API
+ * that don't have a self link and therefore can't be cached
+ */
+export interface UnCacheableObject {
+  [key: string]: any;
+  _links?: {
+    [key: string]: any;
+    self?: never; // UnCacheableObjects can't have a self link
+  }
+}
diff --git a/src/app/core/shared/version-history.model.ts b/src/app/core/shared/version-history.model.ts
index a8ce982fb26..2ab4a7f4651 100644
--- a/src/app/core/shared/version-history.model.ts
+++ b/src/app/core/shared/version-history.model.ts
@@ -2,7 +2,7 @@ import { deserialize, autoserialize, inheritSerialization } from 'cerialize';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list';
+import { PaginatedList } from '../data/paginated-list.model';
 import { Version } from './version.model';
 import { VERSION_HISTORY } from './version-history.resource-type';
 import { link, typedObject } from '../cache/builders/build-decorators';
diff --git a/src/app/core/statistics/models/usage-report.model.ts b/src/app/core/statistics/models/usage-report.model.ts
new file mode 100644
index 00000000000..4350bfd7d89
--- /dev/null
+++ b/src/app/core/statistics/models/usage-report.model.ts
@@ -0,0 +1,51 @@
+import { autoserialize, inheritSerialization } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ResourceType } from '../../shared/resource-type';
+import { HALResource } from '../../shared/hal-resource.model';
+import { USAGE_REPORT } from './usage-report.resource-type';
+import { HALLink } from '../../shared/hal-link.model';
+import { deserialize, autoserializeAs } from 'cerialize';
+
+/**
+ * A usage report.
+ */
+@typedObject
+@inheritSerialization(HALResource)
+export class UsageReport extends HALResource {
+
+  static type = USAGE_REPORT;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  @autoserialize
+  id: string;
+
+  @autoserializeAs('report-type')
+  reportType: string;
+
+  @autoserialize
+  points: Point[];
+
+  @deserialize
+  _links: {
+    self: HALLink;
+  };
+}
+
+/**
+ * A statistics data point.
+ */
+export interface Point {
+  id: string;
+  label: string;
+  type: string;
+  values: Array<{
+    views: number;
+  }>;
+}
diff --git a/src/app/core/integration/models/authority.resource-type.ts b/src/app/core/statistics/models/usage-report.resource-type.ts
similarity index 59%
rename from src/app/core/integration/models/authority.resource-type.ts
rename to src/app/core/statistics/models/usage-report.resource-type.ts
index ec87ddc85f9..650a51b3c31 100644
--- a/src/app/core/integration/models/authority.resource-type.ts
+++ b/src/app/core/statistics/models/usage-report.resource-type.ts
@@ -1,10 +1,9 @@
 import { ResourceType } from '../../shared/resource-type';
 
 /**
- * The resource type for AuthorityValue
+ * The resource type for License
  *
  * Needs to be in a separate file to prevent circular
  * dependencies in webpack.
  */
-
-export const AUTHORITY_VALUE = new ResourceType('authority');
+export const USAGE_REPORT = new ResourceType('usagereport');
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
new file mode 100644
index 00000000000..50c8b3dca37
--- /dev/null
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -0,0 +1,62 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core.reducers';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DataService } from '../data/data.service';
+import { RequestService } from '../data/request.service';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { USAGE_REPORT } from './models/usage-report.resource-type';
+import { UsageReport } from './models/usage-report.model';
+import { Observable } from 'rxjs';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../shared/operators';
+import { map } from 'rxjs/operators';
+
+/**
+ * A service to retrieve {@link UsageReport}s from the REST API
+ */
+@Injectable()
+@dataService(USAGE_REPORT)
+export class UsageReportService extends DataService<UsageReport> {
+
+  protected linkPath = 'usagereports';
+
+  constructor(
+    protected comparator: DefaultChangeAnalyzer<UsageReport>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
+    protected objectCache: ObjectCacheService,
+    protected rdbService: RemoteDataBuildService,
+    protected requestService: RequestService,
+    protected store: Store<CoreState>,
+  ) {
+    super();
+  }
+
+  getStatistic(scope: string, type: string): Observable<UsageReport> {
+    return this.findById(`${scope}_${type}`).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+  }
+
+  searchStatistics(uri: string, page: number, size: number): Observable<UsageReport[]> {
+    return this.searchBy('object', {
+      searchParams: [{
+        fieldName: `uri`,
+        fieldValue: uri,
+      }],
+      currentPage: page,
+      elementsPerPage: size,
+    }, false).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((list) => list.page),
+    );
+  }
+}
diff --git a/src/app/core/submission/models/submission-cc-licence-link.resource-type.ts b/src/app/core/submission/models/submission-cc-licence-link.resource-type.ts
new file mode 100644
index 00000000000..b4e38970f05
--- /dev/null
+++ b/src/app/core/submission/models/submission-cc-licence-link.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for License
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUBMISSION_CC_LICENSE_URL = new ResourceType('submissioncclicenseUrl');
diff --git a/src/app/core/submission/models/submission-cc-licence.resource-type.ts b/src/app/core/submission/models/submission-cc-licence.resource-type.ts
new file mode 100644
index 00000000000..a15b8a0c666
--- /dev/null
+++ b/src/app/core/submission/models/submission-cc-licence.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for License
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUBMISSION_CC_LICENSE = new ResourceType('submissioncclicense');
diff --git a/src/app/core/submission/models/submission-cc-license-url.model.ts b/src/app/core/submission/models/submission-cc-license-url.model.ts
new file mode 100644
index 00000000000..a7c933ecb1b
--- /dev/null
+++ b/src/app/core/submission/models/submission-cc-license-url.model.ts
@@ -0,0 +1,23 @@
+import { autoserialize, inheritSerialization } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ResourceType } from '../../shared/resource-type';
+import { HALResource } from '../../shared/hal-resource.model';
+import { SUBMISSION_CC_LICENSE_URL } from './submission-cc-licence-link.resource-type';
+
+@typedObject
+@inheritSerialization(HALResource)
+export class SubmissionCcLicenceUrl extends HALResource {
+
+  static type = SUBMISSION_CC_LICENSE_URL;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  @autoserialize
+  url: string;
+}
diff --git a/src/app/core/submission/models/submission-cc-license.model.ts b/src/app/core/submission/models/submission-cc-license.model.ts
new file mode 100644
index 00000000000..92c48fdbfe1
--- /dev/null
+++ b/src/app/core/submission/models/submission-cc-license.model.ts
@@ -0,0 +1,42 @@
+import { autoserialize, inheritSerialization } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ResourceType } from '../../shared/resource-type';
+import { HALResource } from '../../shared/hal-resource.model';
+import { SUBMISSION_CC_LICENSE } from './submission-cc-licence.resource-type';
+
+@typedObject
+@inheritSerialization(HALResource)
+export class SubmissionCcLicence extends HALResource {
+
+  static type = SUBMISSION_CC_LICENSE;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  @autoserialize
+  id: string;
+
+  @autoserialize
+  name: string;
+
+  @autoserialize
+  fields: Field[];
+}
+
+export interface Field {
+  id: string;
+  label: string;
+  description: string;
+  enums: Option[];
+}
+
+export interface Option {
+  id: string;
+  label: string;
+  description: string;
+}
diff --git a/src/app/core/submission/models/workspaceitem-section-cc-license.model.ts b/src/app/core/submission/models/workspaceitem-section-cc-license.model.ts
new file mode 100644
index 00000000000..ed7d68354c3
--- /dev/null
+++ b/src/app/core/submission/models/workspaceitem-section-cc-license.model.ts
@@ -0,0 +1,15 @@
+import { Option } from './submission-cc-license.model';
+
+/**
+ * An interface to represent the submission's creative commons license section data.
+ */
+export interface WorkspaceitemSectionCcLicenseObject {
+  ccLicense?: {
+    id: string;
+    fields: {
+      [fieldId: string]: Option;
+    }
+  };
+  uri?: string;
+  accepted?: boolean;
+}
diff --git a/src/app/core/submission/models/workspaceitem-sections.model.ts b/src/app/core/submission/models/workspaceitem-sections.model.ts
index 165e69869c5..6ff756a3236 100644
--- a/src/app/core/submission/models/workspaceitem-sections.model.ts
+++ b/src/app/core/submission/models/workspaceitem-sections.model.ts
@@ -1,6 +1,7 @@
 import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
 import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
 import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
+import { WorkspaceitemSectionCcLicenseObject } from './workspaceitem-section-cc-license.model';
 
 /**
  * An interface to represent submission's section object.
@@ -17,4 +18,5 @@ export type WorkspaceitemSectionDataType
   = WorkspaceitemSectionUploadObject
   | WorkspaceitemSectionFormObject
   | WorkspaceitemSectionLicenseObject
+  | WorkspaceitemSectionCcLicenseObject
   | string;
diff --git a/src/app/core/submission/submission-cc-license-data.service.ts b/src/app/core/submission/submission-cc-license-data.service.ts
new file mode 100644
index 00000000000..5a3fa1ec2b0
--- /dev/null
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -0,0 +1,34 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core.reducers';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DataService } from '../data/data.service';
+import { RequestService } from '../data/request.service';
+import { SUBMISSION_CC_LICENSE } from './models/submission-cc-licence.resource-type';
+import { SubmissionCcLicence } from './models/submission-cc-license.model';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+
+@Injectable()
+@dataService(SUBMISSION_CC_LICENSE)
+export class SubmissionCcLicenseDataService extends DataService<SubmissionCcLicence> {
+
+  protected linkPath = 'submissioncclicenses';
+
+  constructor(
+    protected comparator: DefaultChangeAnalyzer<SubmissionCcLicence>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
+    protected objectCache: ObjectCacheService,
+    protected rdbService: RemoteDataBuildService,
+    protected requestService: RequestService,
+    protected store: Store<CoreState>,
+  ) {
+    super();
+  }
+}
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
new file mode 100644
index 00000000000..ec8f5cc6098
--- /dev/null
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -0,0 +1,76 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core.reducers';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DataService } from '../data/data.service';
+import { RequestService } from '../data/request.service';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { SubmissionCcLicenceUrl } from './models/submission-cc-license-url.model';
+import { SUBMISSION_CC_LICENSE_URL } from './models/submission-cc-licence-link.resource-type';
+import { Field, Option, SubmissionCcLicence } from './models/submission-cc-license.model';
+import { Observable } from 'rxjs';
+import { filter, map, switchMap } from 'rxjs/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../shared/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+
+@Injectable()
+@dataService(SUBMISSION_CC_LICENSE_URL)
+export class SubmissionCcLicenseUrlDataService extends DataService<SubmissionCcLicenceUrl> {
+
+  protected linkPath = 'submissioncclicenseUrl-search';
+
+  constructor(
+    protected comparator: DefaultChangeAnalyzer<SubmissionCcLicenceUrl>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
+    protected objectCache: ObjectCacheService,
+    protected rdbService: RemoteDataBuildService,
+    protected requestService: RequestService,
+    protected store: Store<CoreState>,
+  ) {
+    super();
+  }
+
+  /**
+   * Get the link to the Creative Commons license corresponding to the given type and options.
+   * @param ccLicense   the Creative Commons license type
+   * @param options     the selected options of the license fields
+   */
+  getCcLicenseLink(ccLicense: SubmissionCcLicence, options: Map<Field, Option>): Observable<string> {
+
+    return this.getSearchByHref(
+      'rightsByQuestions',{
+        searchParams: [
+          {
+            fieldName: 'license',
+            fieldValue: ccLicense.id
+          },
+          ...ccLicense.fields.map(
+            (field) => {
+              return {
+                fieldName: `answer_${field.id}`,
+                fieldValue: options.get(field).id,
+              }
+            }),
+        ]
+      }
+    ).pipe(
+      switchMap((href) => this.findByHref(href)),
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((response) => response.url),
+    );
+  }
+
+  protected getSearchEndpoint(searchMethod: string): Observable<string> {
+    return this.halService.getEndpoint(`${this.linkPath}`).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      map((href: string) => `${href}/${searchMethod}`));
+  }
+}
diff --git a/src/app/core/submission/submission-json-patch-operations.service.spec.ts b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
index 39e6cd42fbf..72c807ffa1d 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.spec.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
@@ -8,18 +8,21 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { SubmissionJsonPatchOperationsService } from './submission-json-patch-operations.service';
 import { RequestService } from '../data/request.service';
 import { SubmissionPatchRequest } from '../data/request.models';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 
 describe('SubmissionJsonPatchOperationsService', () => {
   let scheduler: TestScheduler;
   let service: SubmissionJsonPatchOperationsService;
   const requestService = {} as RequestService;
   const store = {} as Store<CoreState>;
+  const rdbService = {} as RemoteDataBuildService;
   const halEndpointService = {} as HALEndpointService;
 
   function initTestService() {
     return new SubmissionJsonPatchOperationsService(
       requestService,
       store,
+      rdbService,
       halEndpointService
     );
   }
diff --git a/src/app/core/submission/submission-json-patch-operations.service.ts b/src/app/core/submission/submission-json-patch-operations.service.ts
index d469f2098fa..cd6308f7f3d 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.ts
@@ -8,6 +8,7 @@ import { JsonPatchOperationsService } from '../json-patch/json-patch-operations.
 import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
 import { SubmissionPatchRequest } from '../data/request.models';
 import { CoreState } from '../core.reducers';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 
 /**
  * A service that provides methods to make JSON Patch requests.
@@ -20,6 +21,7 @@ export class SubmissionJsonPatchOperationsService extends JsonPatchOperationsSer
   constructor(
     protected requestService: RequestService,
     protected store: Store<CoreState>,
+    protected rdbService: RemoteDataBuildService,
     protected halService: HALEndpointService) {
 
     super();
diff --git a/src/app/core/submission/submission-object-data.service.spec.ts b/src/app/core/submission/submission-object-data.service.spec.ts
index f46a465edbf..db23b51f186 100644
--- a/src/app/core/submission/submission-object-data.service.spec.ts
+++ b/src/app/core/submission/submission-object-data.service.spec.ts
@@ -1,18 +1,18 @@
-import { Observable } from 'rxjs';
 import { SubmissionService } from '../../submission/submission.service';
 import { RemoteData } from '../data/remote-data';
 import { SubmissionObject } from './models/submission-object.model';
-import { WorkspaceItem } from './models/workspaceitem.model';
 import { SubmissionObjectDataService } from './submission-object-data.service';
 import { SubmissionScopeType } from './submission-scope-type';
 import { WorkflowItemDataService } from './workflowitem-data.service';
 import { WorkspaceitemDataService } from './workspaceitem-data.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 
 describe('SubmissionObjectDataService', () => {
   let service: SubmissionObjectDataService;
   let submissionService: SubmissionService;
   let workspaceitemDataService: WorkspaceitemDataService;
   let workflowItemDataService: WorkflowItemDataService;
+  let halService: HALEndpointService;
 
   const submissionId = '1234';
   const wsiResult = 'wsiResult' as any;
@@ -25,6 +25,9 @@ describe('SubmissionObjectDataService', () => {
     workflowItemDataService  = jasmine.createSpyObj('WorkflowItemDataService', {
       findById: wfiResult
     });
+    halService  = jasmine.createSpyObj('HALEndpointService', {
+      getEndpoint: '/workspaceItem'
+    });
   });
 
   describe('findById', () => {
@@ -32,7 +35,7 @@ describe('SubmissionObjectDataService', () => {
       submissionService = jasmine.createSpyObj('SubmissionService', {
         getSubmissionScope: {}
       });
-      service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+      service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       service.findById(submissionId);
       expect(submissionService.getSubmissionScope).toHaveBeenCalled();
     });
@@ -42,12 +45,12 @@ describe('SubmissionObjectDataService', () => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
           getSubmissionScope: SubmissionScopeType.WorkspaceItem
         });
-        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
 
       it('should forward the result of WorkspaceitemDataService.findByIdAndIDType()', () => {
         const result = service.findById(submissionId);
-        expect(workspaceitemDataService.findById).toHaveBeenCalledWith(submissionId);
+        expect(workspaceitemDataService.findById).toHaveBeenCalledWith(submissionId, true);
         expect(result).toBe(wsiResult);
       });
     });
@@ -57,12 +60,12 @@ describe('SubmissionObjectDataService', () => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
           getSubmissionScope: SubmissionScopeType.WorkflowItem
         });
-        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
 
       it('should forward the result of WorkflowItemDataService.findByIdAndIDType()', () => {
         const result = service.findById(submissionId);
-        expect(workflowItemDataService.findById).toHaveBeenCalledWith(submissionId);
+        expect(workflowItemDataService.findById).toHaveBeenCalledWith(submissionId, true);
         expect(result).toBe(wfiResult);
       });
     });
@@ -72,7 +75,7 @@ describe('SubmissionObjectDataService', () => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
           getSubmissionScope: 'Something else'
         });
-        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
 
       it('shouldn\'t call any data service methods', () => {
@@ -85,7 +88,7 @@ describe('SubmissionObjectDataService', () => {
         const result = service.findById(submissionId);
         result.subscribe((rd: RemoteData<SubmissionObject>) => {
           expect(rd.hasFailed).toBe(true);
-          expect(rd.error).toBeDefined();
+          expect(rd.errorMessage).toBeDefined();
           done();
         })
       });
diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
index 0b6d65c7580..a63ddfbc288 100644
--- a/src/app/core/submission/submission-object-data.service.ts
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -3,11 +3,15 @@ import { of as observableOf, Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { SubmissionService } from '../../submission/submission.service';
 import { RemoteData } from '../data/remote-data';
-import { RemoteDataError } from '../data/remote-data-error';
 import { SubmissionObject } from './models/submission-object.model';
 import { SubmissionScopeType } from './submission-scope-type';
 import { WorkflowItemDataService } from './workflowitem-data.service';
 import { WorkspaceitemDataService } from './workspaceitem-data.service';
+import { DataService } from '../data/data.service';
+import { map } from 'rxjs/operators';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { environment } from '../../../environments/environment';
+import { RequestEntryState } from '../data/request.reducer';
 
 /**
  * A service to retrieve submission objects (WorkspaceItem/WorkflowItem)
@@ -20,29 +24,47 @@ export class SubmissionObjectDataService {
   constructor(
     private workspaceitemDataService: WorkspaceitemDataService,
     private workflowItemDataService: WorkflowItemDataService,
-    private submissionService: SubmissionService
+    private submissionService: SubmissionService,
+    private halService: HALEndpointService
   ) {
   }
 
+  /**
+   * Create the HREF for a specific object based on its identifier
+   * @param id The identifier for the object
+   */
+  getHrefByID(id): Observable<string> {
+    const dataService: DataService<SubmissionObject> = this.submissionService.getSubmissionScope() === SubmissionScopeType.WorkspaceItem ? this.workspaceitemDataService : this.workflowItemDataService;
+
+    return this.halService.getEndpoint(dataService.getLinkPath()).pipe(
+      map((endpoint: string) => dataService.getIDHref(endpoint, encodeURIComponent(id))));
+  }
+
   /**
    * Retrieve a submission object based on its ID.
    *
-   * @param id The identifier of a submission object
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @param id                The identifier of a submission object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  findById(id: string, ...linksToFollow: Array<FollowLinkConfig<SubmissionObject>>): Observable<RemoteData<SubmissionObject>> {
+  findById(id: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<SubmissionObject>>): Observable<RemoteData<SubmissionObject>> {
     switch (this.submissionService.getSubmissionScope()) {
       case SubmissionScopeType.WorkspaceItem:
-        return this.workspaceitemDataService.findById(id,...linksToFollow);
+        return this.workspaceitemDataService.findById(id, reRequestOnStale,...linksToFollow);
       case SubmissionScopeType.WorkflowItem:
-        return this.workflowItemDataService.findById(id,...linksToFollow);
+        return this.workflowItemDataService.findById(id, reRequestOnStale,...linksToFollow);
       default:
-        const error = new RemoteDataError(
-          undefined,
+        const now = new Date().getTime();
+        return observableOf(new RemoteData(
+          now,
+          environment.cache.msToLive.default,
+          now,
+          RequestEntryState.Error,
+          'The request couldn\'t be sent. Unable to determine the type of submission object',
           undefined,
-          'The request couldn\'t be sent. Unable to determine the type of submission object'
-        );
-        return observableOf(new RemoteData(false, false, false, error, undefined));
+          400
+        ));
     }
   }
 }
diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
index afabde831a4..d1b472e5c02 100644
--- a/src/app/core/submission/submission-response-parsing.service.ts
+++ b/src/app/core/submission/submission-response-parsing.service.ts
@@ -1,11 +1,11 @@
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { deepClone } from 'fast-json-patch';
 import { DSOResponseParsingService } from '../data/dso-response-parsing.service';
 
 import { ResponseParsingService } from '../data/parsing.service';
 import { RestRequest } from '../data/request.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { ErrorResponse, RestResponse, SubmissionSuccessResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { ParsedResponse } from '../cache/response.models';
 import { isEmpty, isNotEmpty, isNotNull } from '../../shared/empty.util';
 import { ConfigObject } from '../config/models/config.model';
 import { BaseResponseParsingService } from '../data/base-response-parsing.service';
@@ -97,32 +97,27 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
    * Parses data from the workspaceitems/workflowitems endpoints
    *
    * @param {RestRequest} request
-   * @param {DSpaceRESTV2Response} data
+   * @param {RawRestResponse} data
    * @returns {RestResponse}
    */
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
     this.dsoParser.parse(deepClone(request), deepClone(data));
     if (isNotEmpty(data.payload)
       && isNotEmpty(data.payload._links)
       && this.isSuccessStatus(data.statusCode)) {
       const dataDefinition = this.processResponse<SubmissionObject | ConfigObject>(data.payload, request);
-      return new SubmissionSuccessResponse(dataDefinition, data.statusCode, data.statusText, this.processPageInfo(data.payload));
+      return new ParsedResponse(data.statusCode, undefined, { dataDefinition });
     } else if (isEmpty(data.payload) && this.isSuccessStatus(data.statusCode)) {
-      return new SubmissionSuccessResponse(null, data.statusCode, data.statusText);
+      return new ParsedResponse(data.statusCode);
     } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from server'),
-          {statusCode: data.statusCode, statusText: data.statusText}
-        )
-      );
+      throw new Error('Unexpected response from server');
     }
   }
 
   /**
    * Parses response and normalize it
    *
-   * @param {DSpaceRESTV2Response} data
+   * @param {RawRestResponse} data
    * @param {RestRequest} request
    * @returns {any[]}
    */
@@ -133,7 +128,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
 
     processedList.forEach((item) => {
 
-      item = Object.assign({}, item);
+      // item = Object.assign({}, item);
       // In case data is an Instance of WorkspaceItem normalize field value of all the section of type form
       if (item instanceof WorkspaceItem
         || item instanceof WorkflowItem) {
@@ -176,5 +171,4 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
 
     return definition;
   }
-
 }
diff --git a/src/app/core/submission/submission-response.model.ts b/src/app/core/submission/submission-response.model.ts
new file mode 100644
index 00000000000..e3cd7cd4cb8
--- /dev/null
+++ b/src/app/core/submission/submission-response.model.ts
@@ -0,0 +1,5 @@
+import { UnCacheableObject } from '../shared/uncacheable-object.model';
+
+export class SubmissionResponse implements UnCacheableObject {
+  dataDefinition: any
+}
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 350874bc503..dacf158839c 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 
-import { merge as observableMerge, Observable, throwError as observableThrowError } from 'rxjs';
-import { distinctUntilChanged, filter, flatMap, map, mergeMap, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { distinctUntilChanged, filter, flatMap, map, tap } from 'rxjs/operators';
 
 import { RequestService } from '../data/request.service';
-import { isNotEmpty } from '../../shared/empty.util';
+import { isNotEmpty, hasValue } from '../../shared/empty.util';
 import {
-  DeleteRequest, GetRequest,
+  DeleteRequest,
   PostRequest,
   RestRequest,
   SubmissionDeleteRequest,
@@ -15,12 +15,13 @@ import {
   SubmissionRequest
 } from '../data/request.models';
 import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ErrorResponse, RestResponse, SubmissionSuccessResponse } from '../cache/response.models';
-import { getResponseFromEntry } from '../shared/operators';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import {URLCombiner} from '../url-combiner/url-combiner';
+import { RemoteData } from '../data/remote-data';
+import { SubmissionResponse } from './submission-response.model';
 
 /**
  * The service handling all submission REST requests
@@ -44,19 +45,17 @@ export class SubmissionRestService {
    *     server response
    */
   protected fetchRequest(requestId: string): Observable<SubmitDataResponseDefinitionObject> {
-    const responses = this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry()
-    );
-    const errorResponses = responses.pipe(
-      filter((response: RestResponse) => !response.isSuccessful),
-      mergeMap((error: ErrorResponse) => observableThrowError(error))
-    );
-    const successResponses = responses.pipe(
-      filter((response: RestResponse) => response.isSuccessful),
-      map((response: SubmissionSuccessResponse) => response.dataDefinition as any),
+    return this.rdbService.buildFromRequestUUID<SubmissionResponse>(requestId).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<SubmissionResponse>) => {
+        if (response.hasFailed) {
+          throw new Error(response.errorMessage);
+        } else {
+          return hasValue(response.payload) ? response.payload.dataDefinition : response.payload;
+        }
+      }),
       distinctUntilChanged()
     );
-    return observableMerge(errorResponses, successResponses);
   }
 
   /**
diff --git a/src/app/core/submission/vocabularies/models/vocabularies.resource-type.ts b/src/app/core/submission/vocabularies/models/vocabularies.resource-type.ts
new file mode 100644
index 00000000000..5902fe4e173
--- /dev/null
+++ b/src/app/core/submission/vocabularies/models/vocabularies.resource-type.ts
@@ -0,0 +1,12 @@
+import { ResourceType } from '../../../shared/resource-type';
+
+/**
+ * The resource type for vocabulary models
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+
+export const VOCABULARY = new ResourceType('vocabulary');
+export const VOCABULARY_ENTRY = new ResourceType('vocabularyEntry');
+export const VOCABULARY_ENTRY_DETAIL = new ResourceType('vocabularyEntryDetail');
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
new file mode 100644
index 00000000000..2e066bae950
--- /dev/null
+++ b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
@@ -0,0 +1,39 @@
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+
+import { HALLink } from '../../../shared/hal-link.model';
+import { VOCABULARY_ENTRY_DETAIL } from './vocabularies.resource-type';
+import { typedObject } from '../../../cache/builders/build-decorators';
+import { VocabularyEntry } from './vocabulary-entry.model';
+
+/**
+ * Model class for a VocabularyEntryDetail
+ */
+@typedObject
+@inheritSerialization(VocabularyEntry)
+export class VocabularyEntryDetail extends VocabularyEntry {
+  static type = VOCABULARY_ENTRY_DETAIL;
+
+  /**
+   * The unique id of the entry
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * In an hierarchical vocabulary representing if entry is selectable as value
+   */
+  @autoserialize
+  selectable: boolean;
+
+  /**
+   * The {@link HALLink}s for this ExternalSourceEntry
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+    vocabulary: HALLink;
+    parent: HALLink;
+    children
+  };
+
+}
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
new file mode 100644
index 00000000000..ca26c1b41e7
--- /dev/null
+++ b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
@@ -0,0 +1,103 @@
+import { autoserialize, deserialize } from 'cerialize';
+
+import { HALLink } from '../../../shared/hal-link.model';
+import { VOCABULARY_ENTRY } from './vocabularies.resource-type';
+import { typedObject } from '../../../cache/builders/build-decorators';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { PLACEHOLDER_PARENT_METADATA } from '../../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { OtherInformation } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
+import { isNotEmpty } from '../../../../shared/empty.util';
+import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model';
+import { GenericConstructor } from '../../../shared/generic-constructor';
+
+/**
+ * Model class for a VocabularyEntry
+ */
+@typedObject
+export class VocabularyEntry extends ListableObject {
+  static type = VOCABULARY_ENTRY;
+
+  /**
+   * The identifier of this vocabulary entry
+   */
+  @autoserialize
+  authority: string;
+
+  /**
+   * The display value of this vocabulary entry
+   */
+  @autoserialize
+  display: string;
+
+  /**
+   * The value of this vocabulary entry
+   */
+  @autoserialize
+  value: string;
+
+  /**
+   * An object containing additional information related to this vocabulary entry
+   */
+  @autoserialize
+  otherInformation: OtherInformation;
+
+  /**
+   * A string representing the kind of vocabulary entry
+   */
+  @excludeFromEquals
+  @autoserialize
+  public type: any;
+
+  /**
+   * The {@link HALLink}s for this ExternalSourceEntry
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+    vocabularyEntryDetail?: HALLink;
+  };
+
+  /**
+   * This method checks if entry has an authority value
+   *
+   * @return boolean
+   */
+  hasAuthority(): boolean {
+    return isNotEmpty(this.authority);
+  }
+
+  /**
+   * This method checks if entry has a value
+   *
+   * @return boolean
+   */
+  hasValue(): boolean {
+    return isNotEmpty(this.value);
+  }
+
+  /**
+   * This method checks if entry has related information object
+   *
+   * @return boolean
+   */
+  hasOtherInformation(): boolean {
+    return isNotEmpty(this.otherInformation);
+  }
+
+  /**
+   * This method checks if entry has a placeholder as value
+   *
+   * @return boolean
+   */
+  hasPlaceholder(): boolean {
+    return this.hasValue() && this.value === PLACEHOLDER_PARENT_METADATA;
+  }
+
+  /**
+   * Method that returns as which type of object this object should be rendered
+   */
+  getRenderTypes(): Array<string | GenericConstructor<ListableObject>> {
+    return [this.constructor as GenericConstructor<ListableObject>];
+  }
+
+}
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
new file mode 100644
index 00000000000..bd9bd55b95a
--- /dev/null
+++ b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
@@ -0,0 +1,37 @@
+import { SortOptions } from '../../../cache/models/sort-options.model';
+import { FindListOptions } from '../../../data/request.models';
+import { RequestParam } from '../../../cache/models/request-param.model';
+import { isNotEmpty } from '../../../../shared/empty.util';
+
+/**
+ * Representing properties used to build a vocabulary find request
+ */
+export class VocabularyFindOptions extends FindListOptions {
+
+  constructor(public query: string = '',
+              public filter?: string,
+              public exact?: boolean,
+              public entryID?: string,
+              public elementsPerPage?: number,
+              public currentPage?: number,
+              public sort?: SortOptions
+              ) {
+    super();
+
+    const searchParams = [];
+
+    if (isNotEmpty(query)) {
+      searchParams.push(new RequestParam('query', query))
+    }
+    if (isNotEmpty(filter)) {
+      searchParams.push(new RequestParam('filter', filter))
+    }
+    if (isNotEmpty(exact)) {
+      searchParams.push(new RequestParam('exact', exact.toString()))
+    }
+    if (isNotEmpty(entryID)) {
+      searchParams.push(new RequestParam('entryID', entryID))
+    }
+    this.searchParams = searchParams;
+  }
+}
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
new file mode 100644
index 00000000000..fd103718e19
--- /dev/null
+++ b/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
@@ -0,0 +1,21 @@
+/**
+ * Representing vocabulary properties
+ */
+export class VocabularyOptions {
+
+  /**
+   * The name of the vocabulary
+   */
+  name: string;
+
+  /**
+   * A boolean representing if value is closely related to a vocabulary entry or not
+   */
+  closed: boolean;
+
+  constructor(name: string,
+              closed: boolean = false) {
+    this.name = name;
+    this.closed = closed;
+  }
+}
diff --git a/src/app/core/submission/vocabularies/models/vocabulary.model.ts b/src/app/core/submission/vocabularies/models/vocabulary.model.ts
new file mode 100644
index 00000000000..8672d1c6ed7
--- /dev/null
+++ b/src/app/core/submission/vocabularies/models/vocabulary.model.ts
@@ -0,0 +1,61 @@
+import { autoserialize, deserialize } from 'cerialize';
+
+import { HALLink } from '../../../shared/hal-link.model';
+import { VOCABULARY } from './vocabularies.resource-type';
+import { CacheableObject } from '../../../cache/object-cache.reducer';
+import { typedObject } from '../../../cache/builders/build-decorators';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+
+/**
+ * Model class for a Vocabulary
+ */
+@typedObject
+export class Vocabulary implements CacheableObject {
+  static type = VOCABULARY;
+  /**
+   * The identifier of this Vocabulary
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * The name of this Vocabulary
+   */
+  @autoserialize
+  name: string;
+
+  /**
+   * True if it is possible to scroll all the entries in the vocabulary without providing a filter parameter
+   */
+  @autoserialize
+  scrollable: boolean;
+
+  /**
+   * True if the vocabulary exposes a tree structure where some entries are parent of others
+   */
+  @autoserialize
+  hierarchical: boolean;
+
+  /**
+   * For hierarchical vocabularies express the preference to preload the tree at a specific
+   * level of depth (0 only the top nodes are shown, 1 also their children are preloaded and so on)
+   */
+  @autoserialize
+  preloadLevel: any;
+
+  /**
+   * A string representing the kind of Vocabulary model
+   */
+  @excludeFromEquals
+  @autoserialize
+  public type: any;
+
+  /**
+   * The {@link HALLink}s for this Vocabulary
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+    entries: HALLink
+  };
+}
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
new file mode 100644
index 00000000000..00d7c0562cf
--- /dev/null
+++ b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
@@ -0,0 +1,567 @@
+import { HttpClient } from '@angular/common/http';
+
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RequestService } from '../../data/request.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { PageInfo } from '../../shared/page-info.model';
+import { PaginatedList, buildPaginatedList } from '../../data/paginated-list.model';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { RequestEntry } from '../../data/request.reducer';
+import { RestResponse } from '../../cache/response.models';
+import { VocabularyService } from './vocabulary.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { VocabularyOptions } from './models/vocabulary-options.model';
+import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
+import { GetRequest } from '../../data/request.models';
+
+describe('VocabularyService', () => {
+  let scheduler: TestScheduler;
+  let service: VocabularyService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let responseCacheEntry: RequestEntry;
+
+  const vocabulary: any = {
+    id: 'types',
+    name: 'types',
+    scrollable: true,
+    hierarchical: false,
+    preloadLevel: 1,
+    type: 'vocabulary',
+    uuid: 'vocabulary-types',
+    _links: {
+      self: {
+        href: 'https://rest.api/rest/api/submission/vocabularies/types'
+      },
+      entries: {
+        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries'
+      },
+    }
+  };
+
+  const hierarchicalVocabulary: any = {
+    id: 'srsc',
+    name: 'srsc',
+    scrollable: false,
+    hierarchical: true,
+    preloadLevel: 2,
+    type: 'vocabulary',
+    uuid: 'vocabulary-srsc',
+    _links: {
+      self: {
+        href: 'https://rest.api/rest/api/submission/vocabularies/types'
+      },
+      entries: {
+        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries'
+      },
+    }
+  };
+
+  const vocabularyEntry: any = {
+    display: 'testValue1',
+    value: 'testValue1',
+    otherInformation: {},
+    type: 'vocabularyEntry'
+  };
+
+  const vocabularyEntry2: any = {
+    display: 'testValue2',
+    value: 'testValue2',
+    otherInformation: {},
+    type: 'vocabularyEntry'
+  };
+
+  const vocabularyEntry3: any = {
+    display: 'testValue3',
+    value: 'testValue3',
+    otherInformation: {},
+    type: 'vocabularyEntry'
+  };
+
+  const vocabularyEntryParentDetail: any = {
+    authority: 'authorityId2',
+    display: 'testParent',
+    value: 'testParent',
+    otherInformation: {
+      id: 'authorityId2',
+      hasChildren: 'true',
+      note: 'Familjeforskning'
+    },
+    type: 'vocabularyEntryDetail',
+    _links: {
+      self: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:VR131402'
+      },
+      parent: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+      },
+      children: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
+      }
+    }
+  };
+
+  const vocabularyEntryChildDetail: any = {
+    authority: 'authoritytestChild1',
+    display: 'testChild1',
+    value: 'testChild1',
+    otherInformation: {
+      id: 'authoritytestChild1',
+      hasChildren: 'true',
+      note: 'Familjeforskning'
+    },
+    type: 'vocabularyEntryDetail',
+    _links: {
+      self: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild1'
+      },
+      parent: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+      },
+      children: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
+      }
+    }
+  };
+
+  const vocabularyEntryChild2Detail: any = {
+    authority: 'authoritytestChild2',
+    display: 'testChild2',
+    value: 'testChild2',
+    otherInformation: {
+      id: 'authoritytestChild2',
+      hasChildren: 'true',
+      note: 'Familjeforskning'
+    },
+    type: 'vocabularyEntryDetail',
+    _links: {
+      self: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild2'
+      },
+      parent: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+      },
+      children: {
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
+      }
+    }
+  };
+
+  const endpointURL = `https://rest.api/rest/api/submission/vocabularies`;
+  const requestURL = `https://rest.api/rest/api/submission/vocabularies/${vocabulary.id}`;
+  const entryDetailEndpointURL = `https://rest.api/rest/api/submission/vocabularyEntryDetails`;
+  const entryDetailRequestURL = `https://rest.api/rest/api/submission/vocabularyEntryDetails/${hierarchicalVocabulary.id}:testValue`;
+  const entryDetailParentRequestURL = `https://rest.api/rest/api/submission/vocabularyEntryDetails/${hierarchicalVocabulary.id}:testValue/parent`;
+  const entryDetailChildrenRequestURL = `https://rest.api/rest/api/submission/vocabularyEntryDetails/${hierarchicalVocabulary.id}:testValue/children`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const vocabularyId = 'types';
+  const metadata = 'dc.type';
+  const collectionUUID = '8b39g7ya-5a4b-438b-851f-be1d5b4a1c5a';
+  const entryID = 'dsfsfsdf-5a4b-438b-851f-be1d5b4a1c5a';
+  const searchRequestURL = `https://rest.api/rest/api/submission/vocabularies/search/byMetadataAndCollection?metadata=${metadata}&collection=${collectionUUID}`;
+  const entriesRequestURL = `https://rest.api/rest/api/submission/vocabularies/${vocabulary.id}/entries`;
+  const entriesByValueRequestURL = `https://rest.api/rest/api/submission/vocabularies/${vocabulary.id}/entries?filter=test&exact=false`;
+  const entryByValueRequestURL = `https://rest.api/rest/api/submission/vocabularies/${vocabulary.id}/entries?filter=test&exact=true`;
+  const entryByIDRequestURL = `https://rest.api/rest/api/submission/vocabularies/${vocabulary.id}/entries?entryID=${entryID}`;
+  const vocabularyOptions: VocabularyOptions = {
+    name: vocabularyId,
+    closed: false
+  }
+  const pageInfo = new PageInfo();
+  const array = [vocabulary, hierarchicalVocabulary];
+  const arrayEntries = [vocabularyEntry, vocabularyEntry2, vocabularyEntry3];
+  const childrenEntries = [vocabularyEntryChildDetail, vocabularyEntryChild2Detail];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const paginatedListEntries = buildPaginatedList(pageInfo, arrayEntries);
+  const childrenPaginatedList = buildPaginatedList(pageInfo, childrenEntries);
+  const vocabularyRD = createSuccessfulRemoteDataObject(vocabulary);
+  const vocabularyRD$ = createSuccessfulRemoteDataObject$(vocabulary);
+  const vocabularyEntriesRD = createSuccessfulRemoteDataObject$(paginatedListEntries);
+  const vocabularyEntryDetailParentRD = createSuccessfulRemoteDataObject(vocabularyEntryParentDetail);
+  const vocabularyEntryChildrenRD = createSuccessfulRemoteDataObject(childrenPaginatedList);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+  const getRequestEntries$ = (successful: boolean) => {
+    return observableOf({
+      response: { isSuccessful: successful, payload: arrayEntries } as any
+    } as RequestEntry)
+  };
+  objectCache = {} as ObjectCacheService;
+  const notificationsService = {} as NotificationsService;
+  const http = {} as HttpClient;
+  const comparator = {} as any;
+  const comparatorEntry = {} as any;
+
+  function initTestService() {
+    return new VocabularyService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator,
+      comparatorEntry
+    );
+  }
+
+  describe('vocabularies endpoint', () => {
+    beforeEach(() => {
+      scheduler = getTestScheduler();
+
+      halService = jasmine.createSpyObj('halService', {
+        getEndpoint: cold('a', { a: endpointURL })
+      });
+    });
+
+    afterEach(() => {
+      service = null;
+    });
+
+    describe('', () => {
+      beforeEach(() => {
+        responseCacheEntry = new RequestEntry();
+        responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+        responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+        requestService = jasmine.createSpyObj('requestService', {
+          generateRequestId: requestUUID,
+          configure: true,
+          removeByHrefSubstring: {},
+          getByHref: observableOf(responseCacheEntry),
+          getByUUID: observableOf(responseCacheEntry),
+        });
+        rdbService = jasmine.createSpyObj('rdbService', {
+          buildSingle: hot('a|', {
+            a: vocabularyRD
+          }),
+          buildList: hot('a|', {
+            a: paginatedListRD
+          }),
+        });
+
+        service = initTestService();
+
+        spyOn((service as any).vocabularyDataService, 'findById').and.callThrough();
+        spyOn((service as any).vocabularyDataService, 'findAll').and.callThrough();
+        spyOn((service as any).vocabularyDataService, 'findByHref').and.callThrough();
+        spyOn((service as any).vocabularyDataService, 'searchBy').and.callThrough();
+        spyOn((service as any).vocabularyDataService, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
+        spyOn((service as any).vocabularyDataService, 'getFindAllHref').and.returnValue(observableOf(entriesRequestURL));
+      });
+
+      afterEach(() => {
+        service = null;
+      });
+
+      describe('findVocabularyById', () => {
+        it('should proxy the call to vocabularyDataService.findVocabularyById', () => {
+          scheduler.schedule(() => service.findVocabularyById(vocabularyId));
+          scheduler.flush();
+
+          expect((service as any).vocabularyDataService.findById).toHaveBeenCalledWith(vocabularyId, true);
+        });
+
+        it('should return a RemoteData<Vocabulary> for the object with the given id', () => {
+          const result = service.findVocabularyById(vocabularyId);
+          const expected = cold('a|', {
+            a: vocabularyRD
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('findVocabularyByHref', () => {
+        it('should proxy the call to vocabularyDataService.findVocabularyByHref', () => {
+          scheduler.schedule(() => service.findVocabularyByHref(requestURL));
+          scheduler.flush();
+
+          expect((service as any).vocabularyDataService.findByHref).toHaveBeenCalledWith(requestURL, true);
+        });
+
+        it('should return a RemoteData<Vocabulary> for the object with the given URL', () => {
+          const result = service.findVocabularyByHref(requestURL);
+          const expected = cold('a|', {
+            a: vocabularyRD
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('findAllVocabularies', () => {
+        it('should proxy the call to vocabularyDataService.findAllVocabularies', () => {
+          scheduler.schedule(() => service.findAllVocabularies());
+          scheduler.flush();
+
+          expect((service as any).vocabularyDataService.findAll).toHaveBeenCalled();
+        });
+
+        it('should return a RemoteData<PaginatedList<Vocabulary>>', () => {
+          const result = service.findAllVocabularies();
+          const expected = cold('a|', {
+            a: paginatedListRD
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('', () => {
+
+      beforeEach(() => {
+        requestService = getMockRequestService(getRequestEntries$(true));
+        rdbService = getMockRemoteDataBuildService(undefined, vocabularyEntriesRD);
+        spyOn(rdbService, 'buildList').and.callThrough();
+        service = initTestService();
+        spyOn(service, 'findVocabularyById').and.returnValue(vocabularyRD$);
+      });
+
+      describe('getVocabularyEntries', () => {
+
+        it('should configure a new VocabularyEntriesRequest', () => {
+          const expected = new GetRequest(requestService.generateRequestId(), entriesRequestURL);
+
+          scheduler.schedule(() => service.getVocabularyEntries(vocabularyOptions, pageInfo).subscribe());
+          scheduler.flush();
+
+          expect(requestService.configure).toHaveBeenCalledWith(expected);
+        });
+
+        it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
+          scheduler.schedule(() => service.getVocabularyEntries(vocabularyOptions, pageInfo));
+          scheduler.flush();
+
+          expect(rdbService.buildList).toHaveBeenCalled();
+        });
+      });
+
+      describe('getVocabularyEntriesByValue', () => {
+
+        it('should configure a new VocabularyEntriesRequest', () => {
+          const expected = new GetRequest(requestService.generateRequestId(), entriesByValueRequestURL);
+
+          scheduler.schedule(() => service.getVocabularyEntriesByValue('test', false, vocabularyOptions, pageInfo).subscribe());
+          scheduler.flush();
+
+          expect(requestService.configure).toHaveBeenCalledWith(expected);
+        });
+
+        it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
+          scheduler.schedule(() => service.getVocabularyEntriesByValue('test', false, vocabularyOptions, pageInfo));
+          scheduler.flush();
+
+          expect(rdbService.buildList).toHaveBeenCalled();
+
+        });
+      });
+
+      describe('getVocabularyEntryByValue', () => {
+
+        it('should configure a new VocabularyEntriesRequest', () => {
+          const expected = new GetRequest(requestService.generateRequestId(), entryByValueRequestURL);
+
+          scheduler.schedule(() => service.getVocabularyEntryByValue('test', vocabularyOptions).subscribe());
+          scheduler.flush();
+
+          expect(requestService.configure).toHaveBeenCalledWith(expected);
+        });
+
+        it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
+          scheduler.schedule(() => service.getVocabularyEntryByValue('test', vocabularyOptions));
+          scheduler.flush();
+
+          expect(rdbService.buildList).toHaveBeenCalled();
+
+        });
+      });
+
+      describe('getVocabularyEntryByID', () => {
+        it('should configure a new VocabularyEntriesRequest', () => {
+          const expected = new GetRequest(requestService.generateRequestId(), entryByIDRequestURL);
+
+          scheduler.schedule(() => service.getVocabularyEntryByID(entryID, vocabularyOptions).subscribe());
+          scheduler.flush();
+
+          expect(requestService.configure).toHaveBeenCalledWith(expected);
+        });
+
+        it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
+          scheduler.schedule(() => service.getVocabularyEntryByID('test', vocabularyOptions));
+          scheduler.flush();
+
+          expect(rdbService.buildList).toHaveBeenCalled();
+
+        });
+      });
+
+    });
+
+  });
+
+  describe('vocabularyEntryDetails endpoint', () => {
+    beforeEach(() => {
+      scheduler = getTestScheduler();
+
+      halService = jasmine.createSpyObj('halService', {
+        getEndpoint: cold('a', { a: entryDetailEndpointURL })
+      });
+
+      responseCacheEntry = new RequestEntry();
+      responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+      responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+      requestService = jasmine.createSpyObj('requestService', {
+        generateRequestId: requestUUID,
+        configure: true,
+        removeByHrefSubstring: {},
+        getByHref: observableOf(responseCacheEntry),
+        getByUUID: observableOf(responseCacheEntry),
+      });
+      rdbService = jasmine.createSpyObj('rdbService', {
+        buildSingle: hot('a|', {
+          a: vocabularyEntryDetailParentRD
+        }),
+        buildList: hot('a|', {
+          a: vocabularyEntryChildrenRD
+        }),
+      });
+
+      service = initTestService();
+
+      spyOn((service as any).vocabularyEntryDetailDataService, 'findById').and.callThrough();
+      spyOn((service as any).vocabularyEntryDetailDataService, 'findAll').and.callThrough();
+      spyOn((service as any).vocabularyEntryDetailDataService, 'findByHref').and.callThrough();
+      spyOn((service as any).vocabularyEntryDetailDataService, 'findAllByHref').and.callThrough();
+      spyOn((service as any).vocabularyEntryDetailDataService, 'searchBy').and.callThrough();
+      spyOn((service as any).vocabularyEntryDetailDataService, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
+      spyOn((service as any).vocabularyEntryDetailDataService, 'getFindAllHref').and.returnValue(observableOf(entryDetailChildrenRequestURL));
+      spyOn((service as any).vocabularyEntryDetailDataService, 'getBrowseEndpoint').and.returnValue(observableOf(entryDetailEndpointURL));
+    });
+
+    afterEach(() => {
+      service = null;
+    });
+
+    describe('findEntryDetailByHref', () => {
+      it('should proxy the call to vocabularyDataService.findEntryDetailByHref', () => {
+        scheduler.schedule(() => service.findEntryDetailByHref(entryDetailRequestURL));
+        scheduler.flush();
+
+        expect((service as any).vocabularyEntryDetailDataService.findByHref).toHaveBeenCalledWith(entryDetailRequestURL, true);
+      });
+
+      it('should return a RemoteData<VocabularyEntryDetail> for the object with the given URL', () => {
+        const result = service.findEntryDetailByHref(entryDetailRequestURL);
+        const expected = cold('a|', {
+          a: vocabularyEntryDetailParentRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
+
+    describe('findEntryDetailById', () => {
+      it('should proxy the call to vocabularyDataService.findVocabularyById', () => {
+        scheduler.schedule(() => service.findEntryDetailById('testValue', hierarchicalVocabulary.id));
+        scheduler.flush();
+        const expectedId = `${hierarchicalVocabulary.id}:testValue`
+        expect((service as any).vocabularyEntryDetailDataService.findById).toHaveBeenCalledWith(expectedId, true);
+      });
+
+      it('should return a RemoteData<VocabularyEntryDetail> for the object with the given id', () => {
+        const result = service.findEntryDetailById('testValue', hierarchicalVocabulary.id);
+        const expected = cold('a|', {
+          a: vocabularyEntryDetailParentRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
+
+    describe('getEntryDetailParent', () => {
+      it('should proxy the call to vocabularyDataService.getEntryDetailParent', () => {
+        scheduler.schedule(() => service.getEntryDetailParent('testValue', hierarchicalVocabulary.id).subscribe());
+        scheduler.flush();
+
+        expect((service as any).vocabularyEntryDetailDataService.findByHref).toHaveBeenCalledWith(entryDetailParentRequestURL, true);
+      });
+
+      it('should return a RemoteData<VocabularyEntryDetail> for the object with the given URL', () => {
+        const result = service.getEntryDetailParent('testValue', hierarchicalVocabulary.id);
+        const expected = cold('a|', {
+          a: vocabularyEntryDetailParentRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
+
+    describe('getEntryDetailChildren', () => {
+      it('should proxy the call to vocabularyDataService.getEntryDetailChildren', () => {
+        const options: VocabularyFindOptions = new VocabularyFindOptions(
+          null,
+          null,
+          null,
+          null,
+          pageInfo.elementsPerPage,
+          pageInfo.currentPage
+        );
+        scheduler.schedule(() => service.getEntryDetailChildren('testValue', hierarchicalVocabulary.id, pageInfo).subscribe());
+        scheduler.flush();
+
+        expect((service as any).vocabularyEntryDetailDataService.findAllByHref).toHaveBeenCalledWith(entryDetailChildrenRequestURL, options, true);
+      });
+
+      it('should return a RemoteData<PaginatedList<ResourcePolicy>> for the object with the given URL', () => {
+        const result = service.getEntryDetailChildren('testValue', hierarchicalVocabulary.id, new PageInfo());
+        const expected = cold('a|', {
+          a: vocabularyEntryChildrenRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
+
+    describe('searchByTop', () => {
+      it('should proxy the call to vocabularyEntryDetailDataService.searchBy', () => {
+        const options: VocabularyFindOptions = new VocabularyFindOptions(
+          null,
+          null,
+          null,
+          null,
+          pageInfo.elementsPerPage,
+          pageInfo.currentPage
+        );
+        options.searchParams = [new RequestParam('vocabulary', 'srsc')];
+        scheduler.schedule(() => service.searchTopEntries('srsc', pageInfo));
+        scheduler.flush();
+
+        expect((service as any).vocabularyEntryDetailDataService.searchBy).toHaveBeenCalledWith((service as any).searchTopMethod, options, true);
+      });
+
+      it('should return a RemoteData<PaginatedList<ResourcePolicy>> for the search', () => {
+        const result = service.searchTopEntries('srsc', pageInfo);
+        const expected = cold('a|', {
+          a: vocabularyEntryChildrenRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+
+    });
+
+    describe('clearSearchTopRequests', () => {
+      it('should remove requests on the data service\'s endpoint', (done) => {
+        service.clearSearchTopRequests();
+
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(`search/${(service as any).searchTopMethod}`);
+        done();
+      });
+    });
+
+  });
+});
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
new file mode 100644
index 00000000000..084713b80b3
--- /dev/null
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -0,0 +1,384 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { distinctUntilChanged, flatMap, map, take } from 'rxjs/operators';
+
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { dataService } from '../../cache/builders/build-decorators';
+import { DataService } from '../../data/data.service';
+import { RequestService } from '../../data/request.service';
+import { FindListOptions, GetRequest } from '../../data/request.models';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RemoteData } from '../../data/remote-data';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ChangeAnalyzer } from '../../data/change-analyzer';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { Vocabulary } from './models/vocabulary.model';
+import { VOCABULARY } from './models/vocabularies.resource-type';
+import { VocabularyEntry } from './models/vocabulary-entry.model';
+import { isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteListPayload
+} from '../../shared/operators';
+import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
+import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { VocabularyOptions } from './models/vocabulary-options.model';
+import { PageInfo } from '../../shared/page-info.model';
+
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * A private DataService implementation to delegate specific methods to.
+ */
+class VocabularyDataServiceImpl extends DataService<Vocabulary> {
+  protected linkPath = 'vocabularies';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: ChangeAnalyzer<Vocabulary>) {
+    super();
+  }
+
+}
+
+/**
+ * A private DataService implementation to delegate specific methods to.
+ */
+class VocabularyEntryDetailDataServiceImpl extends DataService<VocabularyEntryDetail> {
+  protected linkPath = 'vocabularyEntryDetails';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: ChangeAnalyzer<VocabularyEntryDetail>) {
+    super();
+  }
+
+}
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the vocabularies endpoint
+ */
+@Injectable()
+@dataService(VOCABULARY)
+export class VocabularyService {
+  protected searchByMetadataAndCollectionMethod = 'byMetadataAndCollection';
+  protected searchTopMethod = 'top';
+  private vocabularyDataService: VocabularyDataServiceImpl;
+  private vocabularyEntryDetailDataService: VocabularyEntryDetailDataServiceImpl;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparatorVocabulary: DefaultChangeAnalyzer<Vocabulary>,
+    protected comparatorEntry: DefaultChangeAnalyzer<VocabularyEntryDetail>) {
+    this.vocabularyDataService = new VocabularyDataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorVocabulary);
+    this.vocabularyEntryDetailDataService = new VocabularyEntryDetailDataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorEntry);
+  }
+
+  /**
+   * Returns an observable of {@link RemoteData} of a {@link Vocabulary}, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the {@link Vocabulary}
+   * @param href              The url of {@link Vocabulary} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<Vocabulary>>}
+   *    Return an observable that emits vocabulary object
+   */
+  findVocabularyByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Vocabulary>>): Observable<RemoteData<any>> {
+    return this.vocabularyDataService.findByHref(href, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns an observable of {@link RemoteData} of a {@link Vocabulary}, based on its ID, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param name              The name of {@link Vocabulary} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<Vocabulary>>}
+   *    Return an observable that emits vocabulary object
+   */
+  findVocabularyById(name: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Vocabulary>>): Observable<RemoteData<Vocabulary>> {
+    return this.vocabularyDataService.findById(name, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options           Find list options object
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<Vocabulary>>>}
+   *    Return an observable that emits object list
+   */
+  findAllVocabularies(options: FindListOptions = {}, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<Vocabulary>>): Observable<RemoteData<PaginatedList<Vocabulary>>> {
+    return this.vocabularyDataService.findAll(options, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Return the {@link VocabularyEntry} list for a given {@link Vocabulary}
+   *
+   * @param vocabularyOptions  The {@link VocabularyOptions} for the request to which the entries belong
+   * @param pageInfo           The {@link PageInfo} for the request
+   * @return {Observable<RemoteData<PaginatedList<VocabularyEntry>>>}
+   *    Return an observable that emits object list
+   */
+  getVocabularyEntries(vocabularyOptions: VocabularyOptions, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<VocabularyEntry>>> {
+
+    const options: VocabularyFindOptions = new VocabularyFindOptions(
+      null,
+      null,
+      null,
+      null,
+      pageInfo.elementsPerPage,
+      pageInfo.currentPage
+    );
+
+    return this.findVocabularyById(vocabularyOptions.name).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((vocabulary: Vocabulary) => this.vocabularyDataService.buildHrefFromFindOptions(vocabulary._links.entries.href, options)),
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      getVocabularyEntriesFor(this.requestService, this.rdbService)
+    )
+  }
+
+  /**
+   * Return the {@link VocabularyEntry} list for a given value
+   *
+   * @param value              The entry value to retrieve
+   * @param exact              If true force the vocabulary to provide only entries that match exactly with the value
+   * @param vocabularyOptions  The {@link VocabularyOptions} for the request to which the entries belong
+   * @param pageInfo           The {@link PageInfo} for the request
+   * @return {Observable<RemoteData<PaginatedList<VocabularyEntry>>>}
+   *    Return an observable that emits object list
+   */
+  getVocabularyEntriesByValue(value: string, exact: boolean, vocabularyOptions: VocabularyOptions, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<VocabularyEntry>>> {
+    const options: VocabularyFindOptions = new VocabularyFindOptions(
+      null,
+      value,
+      exact,
+      null,
+      pageInfo.elementsPerPage,
+      pageInfo.currentPage
+    );
+
+    return this.findVocabularyById(vocabularyOptions.name).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((vocabulary: Vocabulary) => this.vocabularyDataService.buildHrefFromFindOptions(vocabulary._links.entries.href, options)),
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      getVocabularyEntriesFor(this.requestService, this.rdbService)
+    )
+  }
+
+  /**
+   * Return the {@link VocabularyEntry} list for a given value
+   *
+   * @param value              The entry value to retrieve
+   * @param vocabularyOptions  The {@link VocabularyOptions} for the request to which the entry belongs
+   * @return {Observable<RemoteData<PaginatedList<VocabularyEntry>>>}
+   *    Return an observable that emits {@link VocabularyEntry} object
+   */
+  getVocabularyEntryByValue(value: string, vocabularyOptions: VocabularyOptions): Observable<VocabularyEntry> {
+
+    return this.getVocabularyEntriesByValue(value, true, vocabularyOptions, new PageInfo()).pipe(
+      getFirstSucceededRemoteListPayload(),
+      map((list: VocabularyEntry[]) => {
+        if (isNotEmpty(list)) {
+          return list[0]
+        } else {
+          return null;
+        }
+      })
+    );
+  }
+
+  /**
+   * Return the {@link VocabularyEntry} list for a given ID
+   *
+   * @param ID                 The entry ID to retrieve
+   * @param vocabularyOptions  The {@link VocabularyOptions} for the request to which the entry belongs
+   * @return {Observable<RemoteData<PaginatedList<VocabularyEntry>>>}
+   *    Return an observable that emits {@link VocabularyEntry} object
+   */
+  getVocabularyEntryByID(ID: string, vocabularyOptions: VocabularyOptions): Observable<VocabularyEntry> {
+    const pageInfo = new PageInfo()
+    const options: VocabularyFindOptions = new VocabularyFindOptions(
+      null,
+      null,
+      null,
+      ID,
+      pageInfo.elementsPerPage,
+      pageInfo.currentPage
+    );
+
+    return this.findVocabularyById(vocabularyOptions.name).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((vocabulary: Vocabulary) => this.vocabularyDataService.buildHrefFromFindOptions(vocabulary._links.entries.href, options)),
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      getVocabularyEntriesFor(this.requestService, this.rdbService),
+      getFirstSucceededRemoteListPayload(),
+      map((list: VocabularyEntry[]) => {
+        if (isNotEmpty(list)) {
+          return list[0]
+        } else {
+          return null;
+        }
+      })
+    );
+  }
+
+  /**
+   * Returns an observable of {@link RemoteData} of a {@link VocabularyEntryDetail}, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the {@link VocabularyEntryDetail}
+   * @param href              The url of {@link VocabularyEntryDetail} we want to retrieve
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<VocabularyEntryDetail>>}
+   *    Return an observable that emits vocabulary object
+   */
+  findEntryDetailByHref(href: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<VocabularyEntryDetail>>): Observable<RemoteData<VocabularyEntryDetail>> {
+    return this.vocabularyEntryDetailDataService.findByHref(href, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns an observable of {@link RemoteData} of a {@link VocabularyEntryDetail}, based on its ID, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param id                The entry id for which to provide detailed information.
+   * @param name              The name of {@link Vocabulary} to which the entry belongs
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<VocabularyEntryDetail>>}
+   *    Return an observable that emits VocabularyEntryDetail object
+   */
+  findEntryDetailById(id: string, name: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<VocabularyEntryDetail>>): Observable<RemoteData<VocabularyEntryDetail>> {
+    const findId = `${name}:${id}`;
+    return this.vocabularyEntryDetailDataService.findById(findId, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns the parent detail entry for a given detail entry, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param value             The entry value for which to provide parent.
+   * @param name              The name of {@link Vocabulary} to which the entry belongs
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>>}
+   *    Return an observable that emits a PaginatedList of VocabularyEntryDetail
+   */
+  getEntryDetailParent(value: string, name: string, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<VocabularyEntryDetail>>): Observable<RemoteData<VocabularyEntryDetail>> {
+    const linkPath = `${name}:${value}/parent`;
+
+    return this.vocabularyEntryDetailDataService.getBrowseEndpoint().pipe(
+      map((href: string) => `${href}/${linkPath}`),
+      flatMap((href) => this.vocabularyEntryDetailDataService.findByHref(href, reRequestOnStale, ...linksToFollow))
+    );
+  }
+
+  /**
+   * Returns the list of children detail entries for a given detail entry, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the object
+   * @param value             The entry value for which to provide children list.
+   * @param name              The name of {@link Vocabulary} to which the entry belongs
+   * @param pageInfo          The {@link PageInfo} for the request
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>>}
+   *    Return an observable that emits a PaginatedList of VocabularyEntryDetail
+   */
+  getEntryDetailChildren(value: string, name: string, pageInfo: PageInfo, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<VocabularyEntryDetail>>): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
+    const linkPath = `${name}:${value}/children`;
+    const options: VocabularyFindOptions = new VocabularyFindOptions(
+      null,
+      null,
+      null,
+      null,
+      pageInfo.elementsPerPage,
+      pageInfo.currentPage
+    );
+    return this.vocabularyEntryDetailDataService.getFindAllHref(options, linkPath).pipe(
+      flatMap((href) => this.vocabularyEntryDetailDataService.findAllByHref(href, options, reRequestOnStale, ...linksToFollow))
+    );
+  }
+
+  /**
+   * Return the top level {@link VocabularyEntryDetail} list for a given hierarchical vocabulary
+   *
+   * @param name              The name of hierarchical {@link Vocabulary} to which the entries belongs
+   * @param pageInfo          The {@link PageInfo} for the request
+   * @param reRequestOnStale  Whether or not the request should automatically be re-requested after
+   *                          the response becomes stale
+   * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  searchTopEntries(name: string, pageInfo: PageInfo, reRequestOnStale = true, ...linksToFollow: Array<FollowLinkConfig<VocabularyEntryDetail>>): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
+    const options: VocabularyFindOptions = new VocabularyFindOptions(
+      null,
+      null,
+      null,
+      null,
+      pageInfo.elementsPerPage,
+      pageInfo.currentPage
+    );
+    options.searchParams = [new RequestParam('vocabulary', name)];
+    return this.vocabularyEntryDetailDataService.searchBy(this.searchTopMethod, options, reRequestOnStale, ...linksToFollow)
+  }
+
+  /**
+   * Clear all search Top Requests
+   */
+  clearSearchTopRequests(): void {
+    this.requestService.removeByHrefSubstring(`search/${this.searchTopMethod}`);
+  }
+}
+
+/**
+ * Operator for turning a href into a PaginatedList of VocabularyEntry
+ * @param requestService
+ * @param rdb
+ */
+export const getVocabularyEntriesFor = (requestService: RequestService, rdb: RemoteDataBuildService) =>
+  (source: Observable<string>): Observable<RemoteData<PaginatedList<VocabularyEntry>>> => {
+    const requestId = requestService.generateRequestId();
+
+    source.pipe(take(1)).subscribe((href: string) => {
+      const request = new GetRequest(requestId, href);
+      requestService.configure(request);
+    })
+
+    return rdb.buildList(source);
+  };
+
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index c82f7bf0b59..9ceae40ce6e 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -9,14 +9,16 @@ import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { WorkflowItem } from './models/workflowitem.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DeleteByIDRequest, FindListOptions } from '../data/request.models';
+import { DeleteByIDRequest } from '../data/request.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
-import { RequestEntry } from '../data/request.reducer';
+import { RemoteData } from '../data/remote-data';
+import { NoContent } from '../shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 
 /**
  * A service that provides methods to make REST requests with workflow items endpoint.
@@ -44,7 +46,7 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
    * @param id The Workflow Item's id to be removed
    * @return an observable that emits true when the deletion was successful, false when it failed
    */
-  delete(id: string): Observable<boolean> {
+  delete(id: string): Observable<RemoteData<NoContent>> {
     return this.deleteWFI(id, true)
   }
 
@@ -54,7 +56,10 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
    * @return an observable that emits true when sending back the item was successful, false when it failed
    */
   sendBack(id: string): Observable<boolean> {
-    return this.deleteWFI(id, false)
+    return this.deleteWFI(id, false).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+    );
   }
 
   /**
@@ -64,7 +69,7 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
    * When true, the workflow item and its item will be permanently expunged on the server
    * When false, the workflow item will be removed, but the item will still be available as a workspace item
    */
-  private deleteWFI(id: string, expunge: boolean): Observable<boolean> {
+  private deleteWFI(id: string, expunge: boolean): Observable<RemoteData<NoContent>> {
     const requestId = this.requestService.generateRequestId();
 
     const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
@@ -80,9 +85,6 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
       })
     ).subscribe();
 
-    return this.requestService.getByUUID(requestId).pipe(
-      find((request: RequestEntry) => request.completed),
-      map((request: RequestEntry) => request.response.isSuccessful)
-    );
+    return this.rdbService.buildFromRequestUUID(requestId);
   }
 }
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index fcb85cc8b4b..2fc95bdd007 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -8,7 +8,6 @@ import { CoreState } from '../core.reducers';
 import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindListOptions } from '../data/request.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
@@ -21,7 +20,6 @@ import { WorkspaceItem } from './models/workspaceitem.model';
 @dataService(WorkspaceItem.type)
 export class WorkspaceitemDataService extends DataService<WorkspaceItem> {
   protected linkPath = 'workspaceitems';
-  protected responseMsToLive = 10 * 1000;
 
   constructor(
     protected comparator: DSOChangeAnalyzer<WorkspaceItem>,
diff --git a/src/app/core/tasks/claimed-task-data.service.spec.ts b/src/app/core/tasks/claimed-task-data.service.spec.ts
index c787d012828..98a0f5f51e8 100644
--- a/src/app/core/tasks/claimed-task-data.service.spec.ts
+++ b/src/app/core/tasks/claimed-task-data.service.spec.ts
@@ -8,7 +8,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { CoreState } from '../core.reducers';
 import { ClaimedTaskDataService } from './claimed-task-data.service';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 
 describe('ClaimedTaskDataService', () => {
   let service: ClaimedTaskDataService;
diff --git a/src/app/core/tasks/models/process-task-response.ts b/src/app/core/tasks/models/process-task-response.ts
index ca4bc9a0682..95260b665b5 100644
--- a/src/app/core/tasks/models/process-task-response.ts
+++ b/src/app/core/tasks/models/process-task-response.ts
@@ -1,13 +1,11 @@
-import { RemoteDataError } from '../../data/remote-data-error';
-
 /**
  * A class to represent the data retrieved by after processing a task
  */
 export class ProcessTaskResponse {
   constructor(
     private isSuccessful: boolean,
-    public error?: RemoteDataError,
-    public payload?: any
+    public statusCode?: number,
+    public errorMessage?: string
   ) {
   }
 
diff --git a/src/app/core/tasks/pool-task-data.service.spec.ts b/src/app/core/tasks/pool-task-data.service.spec.ts
index e8511aca6fb..75255d3e0a6 100644
--- a/src/app/core/tasks/pool-task-data.service.spec.ts
+++ b/src/app/core/tasks/pool-task-data.service.spec.ts
@@ -8,7 +8,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { CoreState } from '../core.reducers';
 import { PoolTaskDataService } from './pool-task-data.service';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 
 describe('PoolTaskDataService', () => {
   let service: PoolTaskDataService;
diff --git a/src/app/core/tasks/task-response-parsing.service.ts b/src/app/core/tasks/task-response-parsing.service.ts
index c4bf8afb052..75c40567189 100644
--- a/src/app/core/tasks/task-response-parsing.service.ts
+++ b/src/app/core/tasks/task-response-parsing.service.ts
@@ -1,12 +1,12 @@
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 
 import { ResponseParsingService } from '../data/parsing.service';
 import { RestRequest } from '../data/request.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 
 import { BaseResponseParsingService } from '../data/base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { ErrorResponse, RestResponse, TaskResponse } from '../cache/response.models';
+import { ParsedResponse } from '../cache/response.models';
 
 /**
  * Provides methods to parse response for a task request.
@@ -29,19 +29,14 @@ export class TaskResponseParsingService extends BaseResponseParsingService imple
    * Parses data from the tasks endpoints
    *
    * @param {RestRequest} request
-   * @param {DSpaceRESTV2Response} data
+   * @param {RawRestResponse} data
    * @returns {RestResponse}
    */
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+  parse(request: RestRequest, data: RawRestResponse): ParsedResponse {
     if (this.isSuccessStatus(data.statusCode)) {
-      return new TaskResponse( data.statusCode, data.statusText);
+      return new ParsedResponse(data.statusCode);
     } else {
-      return new ErrorResponse(
-        Object.assign(
-          new Error('Unexpected response from server'),
-          { statusCode: data.statusCode, statusText: data.statusText }
-        )
-      );
+      throw new Error('Unexpected response from server');
     }
   }
 
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 9c8750a8327..3fdb7a1612c 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -17,7 +17,8 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { ChangeAnalyzer } from '../data/change-analyzer';
 import { compare, Operation } from 'fast-json-patch';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 
 const LINK_NAME = 'test';
 
@@ -56,7 +57,7 @@ describe('TasksService', () => {
   const linkPath = 'testTask';
   const requestService = getMockRequestService();
   const halService: any = new HALEndpointServiceStub(taskEndpoint);
-  const rdbService = {} as RemoteDataBuildService;
+  const rdbService = getMockRemoteDataBuildService();
   const notificationsService = {} as NotificationsService;
   const http = {} as HttpClient;
   const comparator = new DummyChangeAnalyzer() as any;
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index 0eae88e96c1..ee29b366bf4 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -1,17 +1,21 @@
 import { HttpHeaders } from '@angular/common/http';
 
-import { merge as observableMerge, Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged, filter, flatMap, map, mergeMap, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { distinctUntilChanged, filter, flatMap, map, tap } from 'rxjs/operators';
 
 import { DataService } from '../data/data.service';
-import { DeleteRequest, FindListOptions, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
+import {
+  DeleteRequest,
+  PostRequest,
+  TaskDeleteRequest,
+  TaskPostRequest
+} from '../data/request.models';
 import { isNotEmpty } from '../../shared/empty.util';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { ProcessTaskResponse } from './models/process-task-response';
-import { RemoteDataError } from '../data/remote-data-error';
-import { getResponseFromEntry } from '../shared/operators';
-import { ErrorResponse, MessageResponse, RestResponse } from '../cache/response.models';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { CacheableObject } from '../cache/object-cache.reducer';
+import { RemoteData } from '../data/remote-data';
 
 /**
  * An abstract class that provides methods to handle task requests.
@@ -27,23 +31,16 @@ export abstract class TasksService<T extends CacheableObject> extends DataServic
    *     server response
    */
   protected fetchRequest(requestId: string): Observable<ProcessTaskResponse> {
-    const responses = this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry()
+    return this.rdbService.buildFromRequestUUID(requestId).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<any>) => {
+        if (response.hasFailed) {
+          return new ProcessTaskResponse(false, response.statusCode, response.errorMessage)
+        } else {
+          return new ProcessTaskResponse(true, response.statusCode);
+        }
+      })
     );
-    const errorResponses = responses.pipe(
-      filter((response: RestResponse) => !response.isSuccessful),
-      mergeMap((response: ErrorResponse) => observableOf(
-        new ProcessTaskResponse(
-          response.isSuccessful,
-          new RemoteDataError(response.statusCode, response.statusText, response.errorMessage)
-        ))
-      ));
-    const successResponses = responses.pipe(
-      filter((response: RestResponse) => response.isSuccessful),
-      map((response: MessageResponse) => new ProcessTaskResponse(response.isSuccessful)),
-      distinctUntilChanged()
-    );
-    return observableMerge(errorResponses, successResponses);
   }
 
   /**
diff --git a/src/app/core/url-combiner/rest-url-combiner.ts b/src/app/core/url-combiner/rest-url-combiner.ts
index 92134050b55..ef3a176a32b 100644
--- a/src/app/core/url-combiner/rest-url-combiner.ts
+++ b/src/app/core/url-combiner/rest-url-combiner.ts
@@ -9,6 +9,6 @@ import { environment } from '../../../environments/environment';
  */
 export class RESTURLCombiner extends URLCombiner {
   constructor(...parts: string[]) {
-    super(environment.rest.baseUrl, ...parts);
+    super(environment.rest.baseUrl, '/api', ...parts);
   }
 }
diff --git a/src/app/curation-form/curation-form.component.html b/src/app/curation-form/curation-form.component.html
new file mode 100644
index 00000000000..c940494016b
--- /dev/null
+++ b/src/app/curation-form/curation-form.component.html
@@ -0,0 +1,20 @@
+<form [formGroup]="form" (ngSubmit)="submit()">
+    <div class="form-group">
+        <div class="row mb-2">
+            <div class="col-12 col-sm-6">
+                <label class="font-weight-bold" for="task">{{'curation.form.task-select.label' |translate }}</label>
+                <select id="task" formControlName="task" class="form-control">
+                    <option *ngFor="let task of tasks" [value]="task">
+                        {{ 'curation-task.task.' + task + '.label' | translate }}
+                    </option>
+                </select>
+            </div>
+            <div *ngIf="!hasHandleValue()" class="col-12 col-sm-6">
+                <label class="font-weight-bold" for="handle">{{'curation.form.handle.label' |translate }}</label>
+                <input id="handle" class="form-control" formControlName="handle">
+                <small class="text-muted">{{'curation.form.handle.hint' |translate }}</small>
+            </div>
+        </div>
+        <button class="btn btn-default btn-primary" type="submit">{{'curation.form.submit' |translate }}</button>
+    </div>
+</form>
diff --git a/src/app/curation-form/curation-form.component.spec.ts b/src/app/curation-form/curation-form.component.spec.ts
new file mode 100644
index 00000000000..96583f44d72
--- /dev/null
+++ b/src/app/curation-form/curation-form.component.spec.ts
@@ -0,0 +1,146 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CurationFormComponent } from './curation-form.component';
+import { ScriptDataService } from '../core/data/processes/script-data.service';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { Process } from '../process-page/processes/process.model';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { Router } from '@angular/router';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+
+describe('CurationFormComponent', () => {
+  let comp: CurationFormComponent;
+  let fixture: ComponentFixture<CurationFormComponent>;
+
+  let scriptDataService: ScriptDataService;
+  let processDataService: ProcessDataService;
+  let configurationDataService: ConfigurationDataService;
+  let notificationsService;
+  let router;
+
+  const process = Object.assign(new Process(), {processId: 'process-id'});
+
+  beforeEach(async(() => {
+
+    scriptDataService = jasmine.createSpyObj('scriptDataService', {
+      invoke: createSuccessfulRemoteDataObject$(process)
+    });
+
+    processDataService = jasmine.createSpyObj('processDataService', {
+      findByHref: createSuccessfulRemoteDataObject$(process)
+    });
+
+    configurationDataService = jasmine.createSpyObj('configurationDataService', {
+      findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'plugin.named.org.dspace.curate.CurationTask',
+        values: [
+          'org.dspace.ctask.general.ProfileFormats = profileformats',
+          '',
+          'org.dspace.ctask.general.RequiredMetadata = requiredmetadata',
+          'org.dspace.ctask.general.MetadataValueLinkChecker = checklinks',
+          'value-to-be-skipped'
+        ]
+      }))
+    });
+
+    notificationsService = new NotificationsServiceStub();
+    router = new RouterStub();
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), FormsModule, ReactiveFormsModule],
+      declarations: [CurationFormComponent],
+      providers: [
+        {provide: ScriptDataService, useValue: scriptDataService},
+        {provide: ProcessDataService, useValue: processDataService},
+        {provide: NotificationsService, useValue: notificationsService},
+        {provide: Router, useValue: router},
+        {provide: ConfigurationDataService, useValue: configurationDataService},
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CurationFormComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+    spyOn(router, 'navigateByUrl').and.callThrough();
+  });
+  describe('init', () => {
+    it('should initialise the comp and contain the different tasks', () => {
+      expect(comp).toBeDefined();
+
+      const elements = fixture.debugElement.queryAll(By.css('option'));
+      expect(elements.length).toEqual(3);
+      expect(elements[0].nativeElement.innerHTML).toContain('curation-task.task.profileformats.label');
+      expect(elements[1].nativeElement.innerHTML).toContain('curation-task.task.requiredmetadata.label');
+      expect(elements[2].nativeElement.innerHTML).toContain('curation-task.task.checklinks.label');
+    });
+  });
+  describe('hasHandleValue', () => {
+    it('should return true when a dsoHandle value was provided', () => {
+      comp.dsoHandle = 'some-handle';
+      fixture.detectChanges();
+
+      expect(comp.hasHandleValue()).toBeTrue();
+    });
+    it('should return false when no dsoHandle value was provided', () => {
+      expect(comp.hasHandleValue()).toBeFalse();
+    });
+  });
+  describe('submit', () => {
+    it('should submit the selected process and handle to the scriptservice and navigate to the corresponding process page', () => {
+      comp.dsoHandle = 'test-handle';
+      comp.submit();
+
+      expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
+        {name: '-t', value: 'profileformats'},
+        {name: '-i', value: 'test-handle'},
+      ], []);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('process-id'));
+    });
+    it('should the selected process and handle to the scriptservice and stay on the page on error', () => {
+      (scriptDataService.invoke as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
+
+      comp.dsoHandle = 'test-handle';
+      comp.submit();
+
+      expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
+        {name: '-t', value: 'profileformats'},
+        {name: '-i', value: 'test-handle'},
+      ], []);
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(processDataService.findByHref).not.toHaveBeenCalled();
+      expect(router.navigateByUrl).not.toHaveBeenCalled();
+    });
+  });
+  it('should use the handle provided by the form when no dsoHandle is provided', () => {
+    comp.form.get('handle').patchValue('form-handle');
+
+    comp.submit();
+
+    expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
+      {name: '-t', value: 'profileformats'},
+      {name: '-i', value: 'form-handle'},
+    ], []);
+  });
+  it('should use "all" when the handle provided by the form is empty and when no dsoHandle is provided', () => {
+
+    comp.submit();
+
+    expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
+      {name: '-t', value: 'profileformats'},
+      {name: '-i', value: 'all'},
+    ], []);
+  });
+});
diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts
new file mode 100644
index 00000000000..abd1c9cba6e
--- /dev/null
+++ b/src/app/curation-form/curation-form.component.ts
@@ -0,0 +1,104 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ScriptDataService } from '../core/data/processes/script-data.service';
+import { FormControl, FormGroup } from '@angular/forms';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { map } from 'rxjs/operators';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { hasValue, isEmpty, isNotEmpty } from '../shared/empty.util';
+import { RemoteData } from '../core/data/remote-data';
+import { Router } from '@angular/router';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { Process } from '../process-page/processes/process.model';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { Observable } from 'rxjs';
+import { find } from 'rxjs/internal/operators/find';
+import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+
+export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
+
+/**
+ * Component responsible for rendering the Curation Task form
+ */
+@Component({
+  selector: 'ds-curation-form',
+  templateUrl: './curation-form.component.html'
+})
+export class CurationFormComponent implements OnInit {
+
+  config: Observable<RemoteData<ConfigurationProperty>>;
+  tasks: string[];
+  form: FormGroup;
+
+  @Input()
+  dsoHandle: string;
+
+  constructor(
+    private scriptDataService: ScriptDataService,
+    private configurationDataService: ConfigurationDataService,
+    private processDataService: ProcessDataService,
+    private notificationsService: NotificationsService,
+    private translateService: TranslateService,
+    private router: Router
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.form = new FormGroup({
+      task: new FormControl(''),
+      handle: new FormControl('')
+    });
+
+    this.config = this.configurationDataService.findByPropertyName(CURATION_CFG);
+    this.config.pipe(
+      find((rd: RemoteData<ConfigurationProperty>) => rd.hasSucceeded),
+      map((rd: RemoteData<ConfigurationProperty>) => rd.payload)
+    ).subscribe((configProperties) => {
+      this.tasks = configProperties.values
+        .filter((value) => isNotEmpty(value) && value.includes('='))
+        .map((value) => value.split('=')[1].trim());
+      this.form.get('task').patchValue(this.tasks[0]);
+    });
+  }
+
+  /**
+   * Determines whether the inputted dsoHandle has a value
+   */
+  hasHandleValue() {
+    if (hasValue(this.dsoHandle)) {
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Submit the selected taskName and handle to the script data service to run the corresponding curation script
+   * Navigate to the process page on success
+   */
+  submit() {
+    const taskName = this.form.get('task').value;
+    let handle;
+    if (this.hasHandleValue()) {
+      handle = this.dsoHandle;
+    } else {
+      handle = this.form.get('handle').value;
+      if (isEmpty(handle)) {
+        handle = 'all';
+      }
+    }
+    this.scriptDataService.invoke('curate', [
+      { name: '-t', value: taskName },
+      { name: '-i', value: handle },
+    ], []).pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<Process>) => {
+      if (rd.hasSucceeded) {
+        this.notificationsService.success(this.translateService.get('curation.form.submit.success.head'),
+          this.translateService.get('curation.form.submit.success.content'));
+        this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
+      } else {
+        this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
+          this.translateService.get('curation.form.submit.error.content'));
+      }
+    });
+  }
+}
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
index fb69ed92f5c..636eac23092 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
@@ -1 +1 @@
-<ds-journal-issue-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-issue-search-result-grid-element>
\ No newline at end of file
+<ds-journal-issue-search-result-grid-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-issue-search-result-grid-element>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
index 31614158ddb..b2dc8c1cce5 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
@@ -1,7 +1,7 @@
 import { Item } from '../../../../core/shared/item.model';
 import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { of as observableOf } from 'rxjs';
 import { async, TestBed } from '@angular/core/testing';
@@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 
 const mockItem = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
index 53713b47ee8..1faa4ed5db1 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
@@ -1 +1 @@
-<ds-journal-volume-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-volume-search-result-grid-element>
\ No newline at end of file
+<ds-journal-volume-search-result-grid-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-volume-search-result-grid-element>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
index 81cb6ff215e..34bf4cdee91 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
@@ -1,7 +1,7 @@
 import { Item } from '../../../../core/shared/item.model';
 import { JournalVolumeGridElementComponent } from './journal-volume-grid-element.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { of as observableOf } from 'rxjs';
 import { async, TestBed } from '@angular/core/testing';
@@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 
 const mockItem = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
index 594a0e0dc11..cb3220bd8e1 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
@@ -1 +1 @@
-<ds-journal-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-search-result-grid-element>
\ No newline at end of file
+<ds-journal-search-result-grid-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-search-result-grid-element>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
index db6d701a7e2..039c7d178d9 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
@@ -2,7 +2,7 @@ import { Item } from '../../../../core/shared/item.model';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { JournalGridElementComponent } from './journal-grid-element.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { async, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 
 const mockItem = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index 0f9b5894f9b..8d1ed60733f 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <ng-content></ng-content>
+    <div class="position-absolute ml-1">
+      <ng-content></ng-content>
+    </div>
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
@@ -17,7 +19,7 @@
             </div>
         </span>
     <div class="card-body">
-      <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
index f65fd97cb0c..8108abbacc2 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
@@ -1,15 +1,15 @@
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec';
 import { JournalIssueSearchResultGridElementComponent } from './journal-issue-search-result-grid-element.component';
+import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -35,7 +35,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
 mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index 16e2a8b847c..82f483e3cff 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <ng-content></ng-content>
+    <div class="position-absolute ml-1">
+      <ng-content></ng-content>
+    </div>
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
@@ -17,7 +19,7 @@
                 </div>
             </span>
     <div class="card-body">
-      <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
index a7d5acdd00f..08053d672bc 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
@@ -1,15 +1,15 @@
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec';
 import { JournalVolumeSearchResultGridElementComponent } from './journal-volume-search-result-grid-element.component';
+import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -35,7 +35,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
 mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index 4902eec71e6..2da30076d42 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <ng-content></ng-content>
+    <div class="position-absolute ml-1">
+      <ng-content></ng-content>
+    </div>
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
@@ -17,7 +19,7 @@
             </div>
         </span>
     <div class="card-body">
-      <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
index 180b7f46001..40de2f72a5a 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
@@ -1,15 +1,15 @@
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec';
 import { JournalSearchResultGridElementComponent } from './journal-search-result-grid-element.component';
+import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -41,7 +41,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
 mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.html
index 398feea260c..395d6eba20b 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.html
@@ -1 +1 @@
-<ds-journal-issue-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-issue-search-result-list-element>
\ No newline at end of file
+<ds-journal-issue-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-issue-search-result-list-element>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.html
index bf967e6e78b..a3f604900e6 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.html
@@ -1 +1 @@
-<ds-journal-volume-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-volume-search-result-list-element>
\ No newline at end of file
+<ds-journal-volume-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-volume-search-result-list-element>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.html
index 3e4dfb0b488..ca028c16591 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.html
@@ -1 +1 @@
-<ds-journal-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-search-result-list-element>
\ No newline at end of file
+<ds-journal-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-journal-search-result-list-element>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 38094c5c798..3ddf3611d14 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -1,4 +1,4 @@
-<ds-item-type-badge [object]="dso"></ds-item-type-badge>
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
 <ds-truncatable [id]="dso.id">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
             [routerLink]="['/items/' + dso.id]" class="lead"
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 460c4a21871..778877fbe26 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -1,4 +1,4 @@
-<ds-item-type-badge [object]="dso"></ds-item-type-badge>
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
 <ds-truncatable [id]="dso.id">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
             [routerLink]="['/items/' + dso.id]" class="lead"
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index a43132d332a..a18d75275b8 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,4 +1,4 @@
-<ds-item-type-badge [object]="dso"></ds-item-type-badge>
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
 <ds-truncatable [id]="dso.id">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
             [routerLink]="['/items/' + dso.id]" class="lead"
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..b9593e76128
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,42 @@
+import { Item } from '../../../../../core/shared/item.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
+import { JournalIssueSidebarSearchListElementComponent } from './journal-issue-sidebar-search-list-element.component';
+
+const object = Object.assign(new ItemSearchResult(), {
+  indexableObject: Object.assign(new Item(), {
+    id: 'test-item',
+    metadata: {
+      'dc.title': [
+        {
+          value: 'title'
+        }
+      ],
+      'publicationvolume.volumeNumber': [
+        {
+          value: '5'
+        }
+      ],
+      'publicationissue.issueNumber': [
+        {
+          value: '7'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Collection(), {
+  id: 'test-collection',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('JournalIssueSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7')
+);
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..84764e9e600
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
@@ -0,0 +1,39 @@
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { Component } from '@angular/core';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+import { isNotEmpty } from '../../../../../shared/empty.util';
+
+@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-journal-issue-sidebar-search-list-element',
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link ItemSearchResult} of type "JournalIssue" within the context of
+ * a sidebar search modal
+ */
+export class JournalIssueSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
+  /**
+   * Get the description of the Journal Issue by returning its volume number(s) and/or issue number(s)
+   */
+  getDescription(): string {
+    const volumeNumbers = this.allMetadataValues(['publicationvolume.volumeNumber']);
+    const issueNumbers = this.allMetadataValues(['publicationissue.issueNumber']);
+    let description = '';
+    if (isNotEmpty(volumeNumbers)) {
+      description += volumeNumbers.join(', ');
+    }
+    if (isNotEmpty(description) && isNotEmpty(issueNumbers)) {
+      description += ' - ';
+    }
+    if (isNotEmpty(issueNumbers)) {
+      description += issueNumbers.join(', ');
+    }
+    return this.undefinedIfEmpty(description);
+  }
+}
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..eca1775c7d2
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,45 @@
+import { Item } from '../../../../../core/shared/item.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
+import { JournalVolumeSidebarSearchListElementComponent } from './journal-volume-sidebar-search-list-element.component';
+
+const object = Object.assign(new ItemSearchResult(), {
+  indexableObject: Object.assign(new Item(), {
+    id: 'test-item',
+    metadata: {
+      'dc.title': [
+        {
+          value: 'title'
+        }
+      ],
+      'journal.title': [
+        {
+          value: 'journal title'
+        }
+      ],
+      'publicationvolume.volumeNumber': [
+        {
+          value: '1'
+        },
+        {
+          value: '2'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Collection(), {
+  id: 'test-collection',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('JournalVolumeSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)')
+);
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..7af5487f402
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
@@ -0,0 +1,39 @@
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { Component } from '@angular/core';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+import { isNotEmpty } from '../../../../../shared/empty.util';
+
+@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-journal-volume-sidebar-search-list-element',
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link ItemSearchResult} of type "JournalVolume" within the context of
+ * a sidebar search modal
+ */
+export class JournalVolumeSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
+  /**
+   * Get the description of the Journal Volume by returning the journal title and volume number(s) (between parentheses)
+   */
+  getDescription(): string {
+    const titles = this.allMetadataValues(['journal.title']);
+    const numbers = this.allMetadataValues(['publicationvolume.volumeNumber']);
+    let description = '';
+    if (isNotEmpty(titles)) {
+      description += titles.join(', ');
+    }
+    if (isNotEmpty(numbers)) {
+      if (isNotEmpty(description)) {
+        description += ' ';
+      }
+      description += numbers.map((n) => `(${n})`).join(' ');
+    }
+    return this.undefinedIfEmpty(description);
+  }
+}
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..a47dbf0e2e4
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,40 @@
+import { Item } from '../../../../../core/shared/item.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
+import { JournalSidebarSearchListElementComponent } from './journal-sidebar-search-list-element.component';
+
+const object = Object.assign(new ItemSearchResult(), {
+  indexableObject: Object.assign(new Item(), {
+    id: 'test-item',
+    metadata: {
+      'dc.title': [
+        {
+          value: 'title'
+        }
+      ],
+      'creativeworkseries.issn': [
+        {
+          value: '1234'
+        },
+        {
+          value: '5678'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Collection(), {
+  id: 'test-collection',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('JournalSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678')
+);
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..4a26b293d9b
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
@@ -0,0 +1,32 @@
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { Component } from '@angular/core';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+import { isNotEmpty } from '../../../../../shared/empty.util';
+
+@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-journal-sidebar-search-list-element',
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link ItemSearchResult} of type "Journal" within the context of
+ * a sidebar search modal
+ */
+export class JournalSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
+  /**
+   * Get the description of the Journal by returning its ISSN(s)
+   */
+  getDescription(): string {
+    const issns = this.allMetadataValues(['creativeworkseries.issn']);
+    let description = '';
+    if (isNotEmpty(issns)) {
+      description += issns.join(', ');
+    }
+    return this.undefinedIfEmpty(description);
+  }
+}
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index cdfa6293c40..c5eb3ba59ec 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,6 +1,11 @@
-<h2 class="item-page-title-field">
-  {{'journalissue.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
-</h2>
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    {{'journalissue.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'journalissue.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
index 2ceafa73720..a7e665d8d40 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
@@ -1,12 +1,15 @@
 import { Item } from '../../../../core/shared/item.model';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { JournalIssueComponent } from './journal-issue.component';
-import { createRelationshipsObservable, getItemPageFieldsTest } from '../../../../+item-page/simple/item-types/shared/item.component.spec';
+import {
+  createRelationshipsObservable,
+  getItemPageFieldsTest
+} from '../../../../+item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'publicationissue.issueNumber': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 5df1997f0bf..38a201df167 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,6 +1,11 @@
-<h2 class="item-page-title-field">
-  {{'journalvolume.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
-</h2>
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    {{'journalvolume.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'journalvolume.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
index 7849a7e077a..06aad2a4013 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
@@ -1,6 +1,6 @@
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { JournalVolumeComponent } from './journal-volume.component';
 import { of as observableOf } from 'rxjs';
@@ -11,7 +11,7 @@ import {
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'publicationvolume.volumeNumber': [
       {
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index d8d32df04a5..874f748049c 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,6 +1,11 @@
-<h2 class="item-page-title-field">
-  {{'journal.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
-</h2>
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    {{'journal.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'journal.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
index 91373ce3e0d..84c6b0da3a8 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
@@ -13,7 +13,7 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipService } from '../../../../core/data/relationship.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
@@ -33,7 +33,7 @@ let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'creativeworkseries.issn': [
       {
diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index d00eae1e546..11ce6c4c2ad 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -18,6 +18,9 @@ import { JournalIssueSearchResultListElementComponent } from './item-list-elemen
 import { JournalVolumeSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component';
 import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
 import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
+import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
+import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
+import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
 
 const ENTRY_COMPONENTS = [
   JournalComponent,
@@ -34,7 +37,10 @@ const ENTRY_COMPONENTS = [
   JournalVolumeSearchResultListElementComponent,
   JournalIssueSearchResultGridElementComponent,
   JournalVolumeSearchResultGridElementComponent,
-  JournalSearchResultGridElementComponent
+  JournalSearchResultGridElementComponent,
+  JournalVolumeSidebarSearchListElementComponent,
+  JournalIssueSidebarSearchListElementComponent,
+  JournalSidebarSearchListElementComponent,
 ];
 
 @NgModule({
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.html
index e4522398a6b..54f22c8c7a9 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.html
@@ -1 +1 @@
-<ds-org-unit-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-org-unit-search-result-grid-element>
+<ds-org-unit-search-result-grid-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-org-unit-search-result-grid-element>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
index 1945f67a5ce..9fca9d04f87 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
@@ -2,7 +2,7 @@ import { Item } from '../../../../core/shared/item.model';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { OrgUnitGridElementComponent } from './org-unit-grid-element.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { async, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 
 const mockItem = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
index a431f5979f7..8a53609c554 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
@@ -1 +1 @@
-<ds-person-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-person-search-result-grid-element>
\ No newline at end of file
+<ds-person-search-result-grid-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-person-search-result-grid-element>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
index 99001e887f8..5bb7ff8b808 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
@@ -2,7 +2,7 @@ import { Item } from '../../../../core/shared/item.model';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { PersonGridElementComponent } from './person-grid-element.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { async, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 
 const mockItem = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
index 0c875993990..4a240baca90 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
@@ -1 +1 @@
-<ds-project-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-project-search-result-grid-element>
\ No newline at end of file
+<ds-project-search-result-grid-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-project-search-result-grid-element>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
index c2ca0a303e6..0540bc5e5d1 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
@@ -2,7 +2,7 @@ import { Item } from '../../../../core/shared/item.model';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { ProjectGridElementComponent } from './project-grid-element.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { async, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 
 const mockItem = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 1f64856583b..c2e1efc7c9e 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <ng-content></ng-content>
+    <div class="position-absolute ml-1">
+      <ng-content></ng-content>
+    </div>
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
@@ -17,7 +19,7 @@
             </div>
         </span>
     <div class="card-body">
-      <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="firstMetadataValue('organization.legalName')"></h4>
       </ds-truncatable-part>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
index 8dec83295eb..0f9b0adca89 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
@@ -1,15 +1,15 @@
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { OrgUnitSearchResultGridElementComponent } from './org-unit-search-result-grid-element.component';
-import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec';
+import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -41,7 +41,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
 mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index cbe93b25456..ff0afcbdb20 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <ng-content></ng-content>
+    <div class="position-absolute ml-1">
+      <ng-content></ng-content>
+    </div>
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
@@ -17,7 +19,7 @@
             </div>
         </span>
     <div class="card-body">
-      <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title"
             [innerHTML]="firstMetadataValue('person.familyName') + ', ' + firstMetadataValue('person.givenName')"></h4>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
index f56d6c76af0..b27aa8cff02 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
@@ -1,15 +1,15 @@
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec';
 import { PersonSearchResultGridElementComponent } from './person-search-result-grid-element.component';
+import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -35,7 +35,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
 mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index 22182d50bef..61f9b44a442 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <ng-content></ng-content>
+    <div class="position-absolute ml-1">
+      <ng-content></ng-content>
+    </div>
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
@@ -17,7 +19,7 @@
       </div>
     </span>
     <div class="card-body">
-      <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
index 5a25eea9558..ef263768387 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
@@ -1,15 +1,15 @@
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { ProjectSearchResultGridElementComponent } from './project-search-result-grid-element.component';
-import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec';
+import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -29,7 +29,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
 mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
diff --git a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.html
index 03ef45c7a4c..cf2dc3e61ce 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.html
@@ -1 +1 @@
-<ds-org-unit-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-org-unit-search-result-list-element>
\ No newline at end of file
+<ds-org-unit-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-org-unit-search-result-list-element>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.html
index dbc3a42a05e..550fa0d12e9 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.html
@@ -1 +1,6 @@
-<ds-person-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-person-search-result-list-element>
\ No newline at end of file
+<ds-person-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }"
+                                      [linkType]="linkType"
+                                      [showLabel]="showLabel"
+                                      [value]="value"
+>
+</ds-person-search-result-list-element>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.html
index 8f74452eaa6..6f229c00e0d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.html
@@ -1 +1 @@
-<ds-project-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-project-search-result-list-element>
\ No newline at end of file
+<ds-project-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-project-search-result-list-element>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index f08d0fdc118..c0d98ccf43a 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,4 +1,4 @@
-<ds-item-type-badge [object]="dso"></ds-item-type-badge>
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
 <ds-truncatable [id]="dso.id">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="['/items/' + dso.id]" class="lead"
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index b2791c48915..634acf10246 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,8 +1,8 @@
-<ds-item-type-badge [object]="dso"></ds-item-type-badge>
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
 <ds-truncatable [id]="dso.id">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="['/items/' + dso.id]" class="lead"
-       [innerHTML]="firstMetadataValue('person.familyName') + ', ' + firstMetadataValue('person.givenName')"></a>
+       [innerHTML]="name"></a>
     <span *ngIf="linkType == linkTypes.None"
           class="lead"
           [innerHTML]="firstMetadataValue('person.familyName') + ', ' + firstMetadataValue('person.givenName')"></span>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index b4b46212614..84f5586876b 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -15,4 +15,10 @@ import { Item } from '../../../../../core/shared/item.model';
  * The component for displaying a list element for an item search result of the type Person
  */
 export class PersonSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
+
+  get name() {
+    return this.value ?
+      this.value :
+      this.firstMetadataValue('person.familyName') + ', ' + this.firstMetadataValue('person.givenName');
+  }
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 95bff99e7e0..b881c706003 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <ds-truncatable [id]="dso.id">
-    <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="['/items/' + dso.id]" class="lead"
        [innerHTML]="firstMetadataValue('dc.title')"></a>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..a271273a1b5
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,37 @@
+import { Item } from '../../../../../core/shared/item.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
+import { OrgUnitSidebarSearchListElementComponent } from './org-unit-sidebar-search-list-element.component';
+
+const object = Object.assign(new ItemSearchResult(), {
+  indexableObject: Object.assign(new Item(), {
+    id: 'test-item',
+    metadata: {
+      'organization.legalName': [
+        {
+          value: 'title'
+        }
+      ],
+      'dc.description': [
+        {
+          value: 'description'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Collection(), {
+  id: 'test-collection',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('OrgUnitSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+);
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..17e9790593d
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
@@ -0,0 +1,33 @@
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { Component } from '@angular/core';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-org-unit-sidebar-search-list-element',
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link ItemSearchResult} of type "OrgUnit" within the context of
+ * a sidebar search modal
+ */
+export class OrgUnitSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
+  /**
+   * Get the title of the Org Unit by returning its legal name
+   */
+  getTitle(): string {
+    return this.firstMetadataValue('organization.legalName');
+  }
+
+  /**
+   * Get the description of the Org Unit by returning its dc.description
+   */
+  getDescription(): string {
+    return this.firstMetadataValue('dc.description');
+  }
+}
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..e93dd78636d
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,45 @@
+import { Item } from '../../../../../core/shared/item.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
+import { PersonSidebarSearchListElementComponent } from './person-sidebar-search-list-element.component';
+import { TranslateService } from '@ngx-translate/core';
+
+const object = Object.assign(new ItemSearchResult(), {
+  indexableObject: Object.assign(new Item(), {
+    id: 'test-item',
+    metadata: {
+      'person.familyName': [
+        {
+          value: 'family name'
+        }
+      ],
+      'person.givenName': [
+        {
+          value: 'given name'
+        }
+      ],
+      'person.jobTitle': [
+        {
+          value: 'job title'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Collection(), {
+  id: 'test-collection',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('PersonSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [
+    { provide: TranslateService, useValue: jasmine.createSpyObj('translate', { instant: '' }) }
+  ])
+);
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..ade080f2e23
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
@@ -0,0 +1,60 @@
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { Component } from '@angular/core';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+import { isNotEmpty } from '../../../../../shared/empty.util';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { TranslateService } from '@ngx-translate/core';
+
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-person-sidebar-search-list-element',
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link ItemSearchResult} of type "Person" within the context of
+ * a sidebar search modal
+ */
+export class PersonSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
+  constructor(protected truncatableService: TruncatableService,
+              protected linkService: LinkService,
+              protected translateService: TranslateService) {
+    super(truncatableService, linkService);
+  }
+
+  /**
+   * Get the title of the Person by returning a combination of its family name and given name (or "No name found")
+   */
+  getTitle(): string {
+    const familyName = this.firstMetadataValue('person.familyName');
+    const givenName = this.firstMetadataValue('person.givenName');
+    let title = '';
+    if (isNotEmpty(familyName)) {
+      title = familyName;
+    }
+    if (isNotEmpty(title)) {
+      title += ', ';
+    }
+    if (isNotEmpty(givenName)) {
+      title += givenName;
+    }
+    return this.defaultIfEmpty(title, this.translateService.instant('person.listelement.no-title'));
+  }
+
+  /**
+   * Get the description of the Person by returning its job title(s)
+   */
+  getDescription(): string {
+    const titles = this.allMetadataValues(['person.jobTitle']);
+    let description = '';
+    if (isNotEmpty(titles)) {
+      description += titles.join(', ');
+    }
+    return this.undefinedIfEmpty(description);
+  }
+}
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..ec0eb0e7bb3
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,32 @@
+import { Item } from '../../../../../core/shared/item.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
+import { ProjectSidebarSearchListElementComponent } from './project-sidebar-search-list-element.component';
+
+const object = Object.assign(new ItemSearchResult(), {
+  indexableObject: Object.assign(new Item(), {
+    id: 'test-item',
+    metadata: {
+      'dc.title': [
+        {
+          value: 'title'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Collection(), {
+  id: 'test-collection',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('ProjectSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined)
+);
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..6fbb9d26fc0
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
@@ -0,0 +1,26 @@
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { Component } from '@angular/core';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+
+@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-project-sidebar-search-list-element',
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link ItemSearchResult} of type "Project" within the context of
+ * a sidebar search modal
+ */
+export class ProjectSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
+  /**
+   * Projects currently don't support a description
+   */
+  getDescription(): string {
+    return undefined;
+  }
+}
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 784000b4468..4d90b85133e 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,6 +1,11 @@
-<h2 class="item-page-title-field">
-  {{'orgunit.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['organization.legalName'])"></ds-metadata-values>
-</h2>
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    {{'orgunit.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['organization.legalName'])"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'orgunit.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
index 2582754b2f4..903970eaf40 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
@@ -1,6 +1,6 @@
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { OrgUnitComponent } from './org-unit.component';
 import { of as observableOf } from 'rxjs';
@@ -11,7 +11,7 @@ import {
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'organization.foundingDate': [
       {
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index af71d5a1c62..2d751eeabb2 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,6 +1,11 @@
-<h2 class="item-page-title-field">
-  {{'person.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="[object?.firstMetadata('person.familyName'), object?.firstMetadata('person.givenName')]" [separator]="', '"></ds-metadata-values>
-</h2>
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    {{'person.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="[object?.firstMetadata('person.familyName'), object?.firstMetadata('person.givenName')]" [separator]="', '"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'person.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
index 471444de640..6a9b5235d78 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
@@ -2,14 +2,14 @@ import {
   createRelationshipsObservable,
   getItemPageFieldsTest
 } from '../../../../+item-page/simple/item-types/shared/item.component.spec';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { PersonComponent } from './person.component';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'person.email': [
       {
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 6c4a0bab01d..4d681bb172a 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,6 +1,11 @@
-<h2 class="item-page-title-field">
-  {{'project.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
-</h2>
+<div class="d-flex flex-row">
+  <h2 class="item-page-title-field mr-auto">
+    {{'project.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
+  </h2>
+  <div class="pl-2">
+    <ds-dso-page-edit-button [pageRoutePrefix]="'items'" [dso]="object" [tooltipMsg]="'project.page.edit'"></ds-dso-page-edit-button>
+  </div>
+</div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
index 24dc865e2ff..02fe71126ba 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
@@ -2,14 +2,14 @@ import {
   createRelationshipsObservable,
   getItemPageFieldsTest
 } from '../../../../+item-page/simple/item-types/shared/item.component.spec';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { ProjectComponent } from './project.component';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     // 'project.identifier.status': [
     //   {
diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html
index d8a4e744e4e..de805a64b3f 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html
@@ -1,7 +1,6 @@
 <ng-template #descTemplate>
   <span class="text-muted">
-      <span *ngIf="metadataRepresentation.allMetadata(['dc.description']).length > 0"
-            class="item-list-job-title">
+      <span class="item-list-job-title">
         <span [innerHTML]="metadataRepresentation.firstMetadataValue(['dc.description'])"></span>
       </span>
   </span>
@@ -9,5 +8,5 @@
 <ds-truncatable [id]="metadataRepresentation.id">
   <a [routerLink]="['/items/' + metadataRepresentation.id]"
      [innerHTML]="metadataRepresentation.getValue()"
-     [tooltip]="metadataRepresentation.allMetadata(['organization.legalName']).length > 0 ? descTemplate : null"></a>
+     [tooltip]="metadataRepresentation.allMetadata(['dc.description']).length > 0 ? descTemplate : null"></a>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index cef3b4539b8..1f50ab830a0 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -26,6 +26,9 @@ import { NameVariantModalComponent } from './submission/name-variant-modal/name-
 import { OrgUnitInputSuggestionsComponent } from './submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component';
 import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
 import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
+import { OrgUnitSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component';
+import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component';
+import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
 
 const ENTRY_COMPONENTS = [
   OrgUnitComponent,
@@ -50,7 +53,10 @@ const ENTRY_COMPONENTS = [
   NameVariantModalComponent,
   OrgUnitSearchResultListSubmissionElementComponent,
   OrgUnitInputSuggestionsComponent,
-  ExternalSourceEntryListSubmissionElementComponent
+  ExternalSourceEntryListSubmissionElementComponent,
+  OrgUnitSidebarSearchListElementComponent,
+  PersonSidebarSearchListElementComponent,
+  ProjectSidebarSearchListElementComponent,
 ];
 
 @NgModule({
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
index 4612996e915..7dee15ca05b 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
@@ -3,11 +3,12 @@ import { ExternalSourceEntry } from '../../../../../core/shared/external-source-
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Context } from '../../../../../core/shared/context.model';
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { MetadataValue } from '../../../../../core/shared/metadata.models';
 
-@listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.SubmissionModal)
+@listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.EntitySearchModal)
+@listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-external-source-entry-list-submission-element',
   styleUrls: ['./external-source-entry-list-submission-element.component.scss'],
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index 93165c24cd6..063e1393cc5 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -1,10 +1,15 @@
 <div class="d-flex">
-    <div class="person-thumbnail pr-2">
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>
-    </div>
+<!--    <div class="person-thumbnail pr-2">-->
+<!--        <ds-thumbnail [thumbnail]="getThumbnail() | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>-->
+<!--    </div>-->
     <div class="flex-grow-1">
-        <ds-org-unit-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
+        <ds-org-unit-input-suggestions *ngIf="useNameVariants" [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
                                        (submitSuggestion)="selectCustom($event)"></ds-org-unit-input-suggestions>
+
+      <div *ngIf="!useNameVariants"
+            class="lead"
+            [innerHTML]="firstMetadataValue('organization.legalName')"></div>
+
         <span class="text-muted">
         <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
               class="item-list-address-locality">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
index 52f5de92d73..f88bbb42eef 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
@@ -14,7 +14,7 @@ import { CommunityDataService } from '../../../../../core/data/community-data.se
 import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RelationshipService } from '../../../../../core/data/relationship.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
@@ -43,7 +43,7 @@ function init() {
     new ItemSearchResult(),
     {
       indexableObject: Object.assign(new Item(), {
-        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [])),
         metadata: {
           'dc.title': [
             {
@@ -70,7 +70,7 @@ function init() {
     new ItemSearchResult(),
     {
       indexableObject: Object.assign(new Item(), {
-        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [])),
         metadata: {
           'dc.title': [
             {
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index 96f28a799bb..1ed9d6cead6 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -20,7 +20,8 @@ import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
 import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
 
-@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SubmissionModal)
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-person-search-result-list-submission-element',
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
@@ -34,6 +35,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
   allSuggestions: string[];
   selectedName: string;
   alternativeField = 'dc.title.alternative';
+  useNameVariants = false;
 
   constructor(protected truncatableService: TruncatableService,
               private relationshipService: RelationshipService,
@@ -48,16 +50,21 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
 
   ngOnInit() {
     super.ngOnInit();
-    const defaultValue = this.firstMetadataValue('organization.legalName');
-    const alternatives = this.allMetadataValues(this.alternativeField);
-    this.allSuggestions = [defaultValue, ...alternatives];
 
-    this.relationshipService.getNameVariant(this.listID, this.dso.uuid)
-      .pipe(take(1))
-      .subscribe((nameVariant: string) => {
-          this.selectedName = nameVariant || defaultValue;
-        }
-      );
+    this.useNameVariants = this.context === Context.EntitySearchModalWithNameVariants;
+
+    if (this.useNameVariants) {
+      const defaultValue = this.firstMetadataValue('organization.legalName');
+      const alternatives = this.allMetadataValues(this.alternativeField);
+      this.allSuggestions = [defaultValue, ...alternatives];
+
+      this.relationshipService.getNameVariant(this.listID, this.dso.uuid)
+        .pipe(take(1))
+        .subscribe((nameVariant: string) => {
+            this.selectedName = nameVariant || defaultValue;
+          }
+        );
+    }
   }
 
   select(value) {
@@ -75,7 +82,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
     if (!this.allSuggestions.includes(value)) {
       this.openModal(value)
         .then(() => {
-
+          // user clicked ok: store the name variant in the item
           const newName: MetadataValue = new MetadataValue();
           newName.value = value;
 
@@ -89,9 +96,12 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
               },
             });
           this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
-        })
+        }).catch(() => {
+        // user clicked cancel: use the name variant only for this relation, no further action required
+      }).finally(() => {
+        this.select(value);
+      })
     }
-    this.select(value);
   }
 
   openModal(value): Promise<any> {
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
index 8301e12c5f3..20b48c805b3 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
@@ -1,6 +1,7 @@
 form {
     z-index: 1;
     &:before {
+        pointer-events: none; // prevent the icon from ‘catching‘ the click
         position: absolute;
         font-weight: 900;
         font-family: "Font Awesome 5 Free";
@@ -15,4 +16,4 @@ form {
     input.suggestion_input {
         background: transparent;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 25c091d3861..9fe9898c2bb 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -1,7 +1,4 @@
 <div class="d-flex">
-    <div class="person-thumbnail pr-2">
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [defaultImage]="'assets/images/person-placeholder.svg'"></ds-thumbnail>
-    </div>
     <div class="flex-grow-1">
         <ds-person-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)" (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index 8064e9be797..f780a61296a 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -14,7 +14,7 @@ import { CommunityDataService } from '../../../../../core/data/community-data.se
 import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RelationshipService } from '../../../../../core/data/relationship.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
@@ -43,7 +43,7 @@ function init() {
     new ItemSearchResult(),
     {
       indexableObject: Object.assign(new Item(), {
-        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [])),
         metadata: {
           'dc.title': [
             {
@@ -64,7 +64,7 @@ function init() {
     new ItemSearchResult(),
     {
       indexableObject: Object.assign(new Item(), {
-        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [])),
         metadata: {
           'dc.title': [
             {
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 83761c6c209..3183d92b078 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -20,7 +20,7 @@ import { MetadataValue } from '../../../../../core/shared/metadata.models';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
 
-@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SubmissionModal)
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-person-search-result-list-submission-element',
   styleUrls: ['./person-search-result-list-submission-element.component.scss'],
@@ -55,12 +55,13 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
     this.relationshipService.getNameVariant(this.listID, this.dso.uuid)
       .pipe(take(1))
       .subscribe((nameVariant: string) => {
-          this.selectedName = nameVariant || defaultValue;
+        this.selectedName = nameVariant || defaultValue;
         }
       );
   }
 
   select(value) {
+    this.relationshipService.setNameVariant(this.listID, this.dso.uuid, value);
     this.selectableListService.isObjectSelected(this.listID, this.object)
       .pipe(take(1))
       .subscribe((selected) => {
@@ -68,34 +69,38 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
           this.selectableListService.selectSingle(this.listID, this.object);
         }
       });
-    this.relationshipService.setNameVariant(this.listID, this.dso.uuid, value);
   }
 
   selectCustom(value) {
     if (!this.allSuggestions.includes(value)) {
       this.openModal(value)
         .then(() => {
+          // user clicked ok: store the name variant in the item
+            const newName: MetadataValue = new MetadataValue();
+            newName.value = value;
 
-          const newName: MetadataValue = new MetadataValue();
-          newName.value = value;
-
-          const existingNames: MetadataValue[] = this.dso.metadata[this.alternativeField] || [];
-          const alternativeNames = { [this.alternativeField]: [...existingNames, newName] };
-          const updatedItem =
-            Object.assign({}, this.dso, {
-              metadata: {
-                ...this.dso.metadata,
-                ...alternativeNames
-              },
-            });
-          this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
-        })
+            const existingNames: MetadataValue[] = this.dso.metadata[this.alternativeField] || [];
+            const alternativeNames = { [this.alternativeField]: [...existingNames, newName] };
+            const updatedItem =
+              Object.assign({}, this.dso, {
+                metadata: {
+                  ...this.dso.metadata,
+                  ...alternativeNames
+                },
+              });
+            this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
+            this.itemDataService.commitUpdates();
+      }).catch(() => {
+        // user clicked cancel: use the name variant only for this relation, no further action required
+      }).finally(() => {
+        this.select(value);
+      })
     }
-    this.select(value);
   }
 
   openModal(value): Promise<any> {
     const modalRef = this.modalService.open(NameVariantModalComponent, { centered: true });
+
     const modalComp = modalRef.componentInstance;
     modalComp.value = value;
     return modalRef.result;
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
index e177b2b561e..062e68da1f8 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -1,11 +1,12 @@
-<form #form="ngForm" (ngSubmit)="onSubmit(value)"
+<form #form="ngForm" (ngSubmit)="onSubmit(inputField.value)"
       [action]="action" (keydown)="onKeydown($event)"
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
+    <input #inputField type="text" [ngModel]="value" [name]="name"
            class="form-control suggestion_input"
            (focus)="open()"
+           (blur)="onSubmit(inputField.value)"
            (click)="open()"
            [ngClass]="{'is-invalid': !valid}"
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
@@ -21,4 +22,4 @@
             </div>
         </div>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
index 8301e12c5f3..86233c473a4 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
@@ -1,6 +1,6 @@
 form {
-    z-index: 1;
     &:before {
+        pointer-events: none; // prevent the icon from ‘catching‘ the click
         position: absolute;
         font-weight: 900;
         font-family: "Font Awesome 5 Free";
@@ -9,10 +9,9 @@ form {
         right: 0;
         height: 20px;
         width: 20px;
-        z-index: -1;
     }
 
     input.suggestion_input {
         background: transparent;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
index a1802ce1a7d..5b4ecd9d2e5 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -33,8 +33,10 @@ export class PersonInputSuggestionsComponent extends InputSuggestionsComponent i
   }
 
   onSubmit(data) {
-    this.value = data;
-    this.submitSuggestion.emit(data);
+    if (data !== this.value) {
+      this.value = data;
+      this.submitSuggestion.emit(data);
+    }
   }
 
   onClickSuggestion(data) {
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index fec75b2fd35..6d30302f801 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,10 +1,21 @@
 <footer class="footer">
-  <div class="container-fluid content-container-fluid">
-    <img src="assets/images/dspace-logo.png" />
-    <p>
-      <a href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
-      {{ 'footer.copyright' | translate:{year : dateObj | date:'y'} }}
-      <a href="http://www.duraspace.org/">{{ 'footer.link.duraspace' | translate}}</a>
-    </p>
-  </div>
+    <div class="container-fluid content-container-fluid">
+        <img src="assets/images/dspace-logo.png"/>
+        <p>
+            <a href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
+            {{ 'footer.copyright' | translate:{year: dateObj | date:'y'} }}
+            <a href="http://www.duraspace.org/">{{ 'footer.link.duraspace' | translate}}</a>
+        </p>
+        <ul class="list-unstyled small d-flex justify-content-center mb-0 text-secondary">
+            <li>
+                <a href="#" (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
+            </li>
+            <li>
+                <a routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
+            </li>
+            <li>
+                <a routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
+            </li>
+        </ul>
+    </div>
 </footer>
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 51201774d55..fb51fc258dc 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -4,15 +4,37 @@ $footer-padding: $spacer * 1.5;
 $footer-logo-height: 55px;
 
 .footer {
-  background-color: $footer-bg;
-  border-top: $footer-border;
-  text-align: center;
-  padding: $footer-padding;
+    background-color: $footer-bg;
+    border-top: $footer-border;
+    text-align: center;
+    padding: $footer-padding;
+    padding-bottom: $spacer;
 
-  p {
-    margin: 0;
-  }
-  img {
-    height: $footer-logo-height;
-  }
+    p {
+        margin: 0;
+    }
+
+    img {
+        height: $footer-logo-height;
+    }
+
+    ul {
+        padding-top: $spacer * 0.5;
+
+        li {
+            display: inline-flex;
+            a {
+                padding: 0 $spacer/2;
+                color: inherit
+            }
+
+            &:not(:last-child) {
+                &:after {
+                    content: '';
+                    border-right: 1px map-get($theme-colors, secondary) solid;
+                }
+
+            }
+        }
+    }
 }
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index 94b239d204a..6ece2cf08ba 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,4 +1,6 @@
-import { Component } from '@angular/core';
+import { Component, Optional } from '@angular/core';
+import { hasValue } from '../shared/empty.util';
+import { KlaroService } from '../shared/cookies/klaro.service';
 
 @Component({
   selector: 'ds-footer',
@@ -6,7 +8,15 @@ import { Component } from '@angular/core';
   templateUrl: 'footer.component.html'
 })
 export class FooterComponent {
-
   dateObj: number = Date.now();
 
+  constructor(@Optional() private cookies: KlaroService) {
+  }
+
+  showCookieSettings() {
+    if (hasValue(this.cookies)) {
+      this.cookies.showSettings();
+    }
+    return false;
+  }
 }
diff --git a/src/app/forbidden/forbidden.component.html b/src/app/forbidden/forbidden.component.html
new file mode 100644
index 00000000000..067aad0048b
--- /dev/null
+++ b/src/app/forbidden/forbidden.component.html
@@ -0,0 +1,10 @@
+<div class="forbidden container">
+  <h1>403</h1>
+  <h2><small>{{"403.forbidden" | translate}}</small></h2>
+  <br/>
+  <p>{{"403.help" | translate}}</p>
+  <br/>
+  <p class="text-center">
+    <a routerLink="/home" class="btn btn-primary">{{"403.link.home-page" | translate}}</a>
+  </p>
+</div>
diff --git a/src/app/forbidden/forbidden.component.scss b/src/app/forbidden/forbidden.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/forbidden/forbidden.component.ts b/src/app/forbidden/forbidden.component.ts
new file mode 100644
index 00000000000..b622a0f066e
--- /dev/null
+++ b/src/app/forbidden/forbidden.component.ts
@@ -0,0 +1,32 @@
+import { Component, OnInit } from '@angular/core';
+import { AuthService } from '../core/auth/auth.service';
+import { ServerResponseService } from '../core/services/server-response.service';
+
+/**
+ * This component representing the `Forbidden` DSpace page.
+ */
+@Component({
+  selector: 'ds-forbidden',
+  templateUrl: './forbidden.component.html',
+  styleUrls: ['./forbidden.component.scss']
+})
+export class ForbiddenComponent implements OnInit {
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {AuthService} authService
+   * @param {ServerResponseService} responseService
+   */
+  constructor(private authService: AuthService, private responseService: ServerResponseService) {
+    this.responseService.setForbidden();
+  }
+
+  /**
+   * Remove redirect url from the state
+   */
+  ngOnInit(): void {
+    this.authService.clearRedirectUrl();
+  }
+
+}
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.html b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
new file mode 100644
index 00000000000..263f142c2e3
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
@@ -0,0 +1,3 @@
+<ds-register-email-form
+    [MESSAGE_PREFIX]="'forgot-email.form'">
+</ds-register-email-form>
\ No newline at end of file
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
new file mode 100644
index 00000000000..d466cbf11bc
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
@@ -0,0 +1,29 @@
+import { ForgotEmailComponent } from './forgot-email.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { ReactiveFormsModule } from '@angular/forms';
+
+describe('ForgotEmailComponent', () => {
+  let comp: ForgotEmailComponent;
+  let fixture: ComponentFixture<ForgotEmailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [ForgotEmailComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ForgotEmailComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  it('should be defined', () => {
+    expect(comp).toBeDefined();
+  });
+});
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
new file mode 100644
index 00000000000..5e18aff1138
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-forgot-email',
+  templateUrl: './forgot-email.component.html'
+})
+/**
+ * Component responsible the forgot password email step
+ */
+export class ForgotEmailComponent {
+
+}
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
new file mode 100644
index 00000000000..06a1909f002
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -0,0 +1,36 @@
+<div class="container">
+    <h3 class="mb-4">{{'forgot-password.form.head' | translate}}</h3>
+    <div class="card mb-4">
+        <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
+        <div class="card-body">
+            <div class="row">
+                <div class="col-12">
+                    <label class="font-weight-bold"
+                           for="email">{{'forgot-password.form.identification.email' | translate}}</label>
+                    <span id="email">{{(registration$ |async).email}}</span></div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card mb-4">
+        <div class="card-header">{{'forgot-password.form.card.security' | translate}}</div>
+        <div class="card-body">
+
+            <ds-profile-page-security-form
+                    [passwordCanBeEmpty]="false"
+                    [FORM_PREFIX]="'forgot-password.form.'"
+                    (isInvalid)="setInValid($event)"
+                    (passwordValue)="setPasswordValue($event)"
+            ></ds-profile-page-security-form>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-12">
+            <button
+                    [disabled]="isInValid"
+                    class="btn btn-default btn-primary"
+                    (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
new file mode 100644
index 00000000000..3e72a8ae0b7
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
@@ -0,0 +1,117 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CoreState } from '../../core/core.reducers';
+import { Registration } from '../../core/shared/registration.model';
+import { ForgotPasswordFormComponent } from './forgot-password-form.component';
+import { By } from '@angular/platform-browser';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+describe('ForgotPasswordFormComponent', () => {
+  let comp: ForgotPasswordFormComponent;
+  let fixture: ComponentFixture<ForgotPasswordFormComponent>;
+
+  let router;
+  let route;
+  let ePersonDataService: EPersonDataService;
+  let notificationsService;
+  let store: Store<CoreState>;
+
+  const registration = Object.assign(new Registration(), {
+    email: 'test@email.org',
+    user: 'test-uuid',
+    token: 'test-token'
+  });
+
+  beforeEach(async(() => {
+
+    route = {data: observableOf({registration: registration})};
+    router = new RouterStub();
+    notificationsService = new NotificationsServiceStub();
+
+    ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
+      patchPasswordWithToken: createSuccessfulRemoteDataObject$({})
+    });
+
+    store = jasmine.createSpyObj('store', {
+      dispatch: {},
+    });
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [ForgotPasswordFormComponent],
+      providers: [
+        {provide: Router, useValue: router},
+        {provide: ActivatedRoute, useValue: route},
+        {provide: Store, useValue: store},
+        {provide: EPersonDataService, useValue: ePersonDataService},
+        {provide: FormBuilder, useValue: new FormBuilder()},
+        {provide: NotificationsService, useValue: notificationsService},
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ForgotPasswordFormComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should initialise mail address', () => {
+      const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement;
+      expect(elem.innerHTML).toContain('test@email.org');
+    });
+  });
+
+  describe('submit', () => {
+
+    it('should submit a patch request for the user uuid and log in on success', () => {
+      comp.password = 'password';
+      comp.isInValid = false;
+
+      comp.submit();
+
+      expect(ePersonDataService.patchPasswordWithToken).toHaveBeenCalledWith('test-uuid', 'test-token', 'password');
+      expect(store.dispatch).toHaveBeenCalledWith(new AuthenticateAction('test@email.org', 'password'));
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+      expect(notificationsService.success).toHaveBeenCalled();
+    });
+
+    it('should submit a patch request for the user uuid and stay on page on error', () => {
+
+      (ePersonDataService.patchPasswordWithToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
+
+      comp.password = 'password';
+      comp.isInValid = false;
+
+      comp.submit();
+
+      expect(ePersonDataService.patchPasswordWithToken).toHaveBeenCalledWith('test-uuid', 'test-token', 'password');
+      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(router.navigate).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+    });
+    it('should submit a patch request for the user uuid when the form is invalid', () => {
+
+      comp.password = 'password';
+      comp.isInValid = true;
+
+      comp.submit();
+
+      expect(ePersonDataService.patchPasswordWithToken).not.toHaveBeenCalled();
+    });
+  })
+});
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
new file mode 100644
index 00000000000..8bfed0b2ebf
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -0,0 +1,88 @@
+import { Component } from '@angular/core';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { TranslateService } from '@ngx-translate/core';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { Observable } from 'rxjs';
+import { Registration } from '../../core/shared/registration.model';
+import { map } from 'rxjs/operators';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core/core.reducers';
+import { RemoteData } from '../../core/data/remote-data';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+
+@Component({
+  selector: 'ds-forgot-password-form',
+  templateUrl: './forgot-password-form.component.html'
+})
+/**
+ * Component for a user to enter a new password for a forgot token.
+ */
+export class ForgotPasswordFormComponent {
+
+  registration$: Observable<Registration>;
+
+  token: string;
+  email: string;
+  user: string;
+
+  isInValid = true;
+  password: string;
+
+  /**
+   * Prefix for the notification messages of this component
+   */
+  NOTIFICATIONS_PREFIX = 'forgot-password.form.notification';
+
+  constructor(private ePersonDataService: EPersonDataService,
+              private translateService: TranslateService,
+              private notificationsService: NotificationsService,
+              private store: Store<CoreState>,
+              private router: Router,
+              private route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.registration$ = this.route.data.pipe(
+      map((data) => data.registration as Registration),
+    );
+    this.registration$.subscribe((registration: Registration) => {
+      this.email = registration.email;
+      this.token = registration.token;
+      this.user = registration.user;
+    });
+  }
+
+  setInValid($event: boolean) {
+    this.isInValid = $event;
+  }
+
+  setPasswordValue($event: string) {
+    this.password = $event;
+  }
+
+  /**
+   * Submits the password to the eperson service to be updated.
+   * The submission will not be made when the form is not valid.
+   */
+  submit() {
+    if (!this.isInValid) {
+      this.ePersonDataService.patchPasswordWithToken(this.user, this.token, this.password).subscribe((response: RemoteData<EPerson>) => {
+        if (response.hasSucceeded) {
+          this.notificationsService.success(
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.title'),
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content')
+          );
+          this.store.dispatch(new AuthenticateAction(this.email, this.password));
+          this.router.navigate(['/home']);
+        } else {
+          this.notificationsService.error(
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.error.title'), response.errorMessage
+          );
+        }
+      });
+    }
+  }
+}
diff --git a/src/app/forgot-password/forgot-password-routing.module.ts b/src/app/forgot-password/forgot-password-routing.module.ts
new file mode 100644
index 00000000000..702de03a9df
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-routing.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { ItemPageResolver } from '../+item-page/item-page.resolver';
+import { RegistrationResolver } from '../register-email-form/registration.resolver';
+import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
+import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        component: ForgotEmailComponent,
+        data: {title: 'forgot-password.title'},
+      },
+      {
+        path: ':token',
+        component: ForgotPasswordFormComponent,
+        resolve: {registration: RegistrationResolver}
+      }
+    ])
+  ],
+  providers: [
+    RegistrationResolver,
+    ItemPageResolver
+  ]
+})
+/**
+ * This module defines the routing to the components related to the forgot password components.
+ */
+export class ForgotPasswordRoutingModule {
+}
diff --git a/src/app/forgot-password/forgot-password.module.ts b/src/app/forgot-password/forgot-password.module.ts
new file mode 100644
index 00000000000..5f01f0fcd2a
--- /dev/null
+++ b/src/app/forgot-password/forgot-password.module.ts
@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component';
+import { ForgotPasswordRoutingModule } from './forgot-password-routing.module';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
+import { ProfilePageModule } from '../profile-page/profile-page.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    ForgotPasswordRoutingModule,
+    RegisterEmailFormModule,
+    ProfilePageModule,
+  ],
+  declarations: [
+    ForgotEmailComponent,
+    ForgotPasswordFormComponent
+  ],
+  providers: [],
+  entryComponents: []
+})
+
+/**
+ * Module related to the Forgot Password components
+ */
+export class ForgotPasswordModule {
+
+}
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
new file mode 100644
index 00000000000..1ee8712444f
--- /dev/null
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
@@ -0,0 +1,37 @@
+<h2>{{ 'info.end-user-agreement.head' | translate }}</h2>
+<p>
+  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Nunc sed velit dignissim sodales ut eu. In ante metus dictum at tempor. Diam phasellus vestibulum lorem sed risus. Sed cras ornare arcu dui vivamus. Sit amet consectetur adipiscing elit pellentesque. Id velit ut tortor pretium viverra suspendisse potenti. Sed euismod nisi porta lorem mollis aliquam ut. Justo laoreet sit amet cursus sit amet dictum sit. Ullamcorper morbi tincidunt ornare massa eget egestas.
+</p>
+<p>
+  In iaculis nunc sed augue lacus. Curabitur vitae nunc sed velit dignissim sodales ut eu sem. Tellus id interdum velit laoreet id donec ultrices tincidunt arcu. Quis vel eros donec ac odio tempor. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Varius quam quisque id diam vel quam. Nisl tincidunt eget nullam non nisi est sit. Nunc aliquet bibendum enim facilisis. Aenean sed adipiscing diam donec adipiscing. Convallis tellus id interdum velit laoreet. Massa placerat duis ultricies lacus sed turpis tincidunt. Sed cras ornare arcu dui vivamus arcu. Egestas integer eget aliquet nibh praesent tristique. Sit amet purus gravida quis blandit turpis cursus in hac. Porta non pulvinar neque laoreet suspendisse. Quis risus sed vulputate odio ut. Dignissim enim sit amet venenatis urna cursus.
+</p>
+<p>
+  Interdum velit laoreet id donec ultrices tincidunt arcu non sodales. Massa sapien faucibus et molestie. Dictumst vestibulum rhoncus est pellentesque elit ullamcorper. Metus dictum at tempor commodo ullamcorper. Tincidunt lobortis feugiat vivamus at augue eget. Non diam phasellus vestibulum lorem sed risus ultricies. Neque aliquam vestibulum morbi blandit cursus risus at ultrices mi. Euismod lacinia at quis risus sed. Lorem mollis aliquam ut porttitor leo a diam. Ipsum dolor sit amet consectetur. Ante in nibh mauris cursus mattis molestie a iaculis at. Commodo ullamcorper a lacus vestibulum. Pellentesque elit eget gravida cum sociis. Sit amet commodo nulla facilisi nullam vehicula. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus aenean.
+</p>
+<p>
+  Ac turpis egestas maecenas pharetra convallis. Lacus sed viverra tellus in. Nullam eget felis eget nunc lobortis mattis aliquam faucibus purus. Id aliquet risus feugiat in ante metus dictum at. Quis enim lobortis scelerisque fermentum dui faucibus. Eu volutpat odio facilisis mauris sit amet massa vitae tortor. Tellus elementum sagittis vitae et leo. Cras sed felis eget velit aliquet sagittis. Proin fermentum leo vel orci porta non pulvinar neque laoreet. Dui sapien eget mi proin sed libero enim. Ultrices mi tempus imperdiet nulla malesuada. Mattis molestie a iaculis at. Turpis massa sed elementum tempus egestas.
+</p>
+<p>
+  Dui faucibus in ornare quam viverra orci sagittis eu volutpat. Cras adipiscing enim eu turpis. Ac felis donec et odio pellentesque. Iaculis nunc sed augue lacus viverra vitae congue eu consequat. Posuere lorem ipsum dolor sit amet consectetur adipiscing elit duis. Elit eget gravida cum sociis natoque penatibus. Id faucibus nisl tincidunt eget nullam non. Sagittis aliquam malesuada bibendum arcu vitae. Fermentum leo vel orci porta. Aliquam ultrices sagittis orci a scelerisque purus semper. Diam maecenas sed enim ut sem viverra aliquet eget sit. Et ultrices neque ornare aenean euismod. Eu mi bibendum neque egestas congue quisque egestas diam. Eget lorem dolor sed viverra. Ut lectus arcu bibendum at. Rutrum tellus pellentesque eu tincidunt tortor. Vitae congue eu consequat ac. Elit ullamcorper dignissim cras tincidunt. Sit amet volutpat consequat mauris nunc congue nisi.
+</p>
+<p>
+  Cursus in hac habitasse platea dictumst quisque sagittis purus. Placerat duis ultricies lacus sed turpis tincidunt. In egestas erat imperdiet sed euismod nisi porta lorem mollis. Non nisi est sit amet facilisis magna. In massa tempor nec feugiat nisl pretium fusce. Pulvinar neque laoreet suspendisse interdum consectetur. Ullamcorper morbi tincidunt ornare massa eget egestas purus viverra accumsan. Fringilla urna porttitor rhoncus dolor purus non enim. Mauris nunc congue nisi vitae suscipit. Commodo elit at imperdiet dui accumsan sit amet nulla. Tempor id eu nisl nunc mi ipsum faucibus. Porta non pulvinar neque laoreet suspendisse. Nec nam aliquam sem et tortor consequat.
+</p>
+<p>
+  Eget nunc lobortis mattis aliquam faucibus purus. Odio tempor orci dapibus ultrices. Sed nisi lacus sed viverra tellus. Elit ullamcorper dignissim cras tincidunt. Porttitor rhoncus dolor purus non enim praesent elementum facilisis. Viverra orci sagittis eu volutpat odio. Pharetra massa massa ultricies mi quis. Lectus vestibulum mattis ullamcorper velit sed ullamcorper. Pulvinar neque laoreet suspendisse interdum consectetur. Vitae auctor eu augue ut. Arcu dictum varius duis at consectetur lorem donec. Massa sed elementum tempus egestas sed sed. Risus viverra adipiscing at in tellus integer. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Pharetra massa massa ultricies mi. Elementum eu facilisis sed odio morbi quis commodo odio. Tincidunt lobortis feugiat vivamus at. Felis donec et odio pellentesque diam volutpat commodo sed. Risus feugiat in ante metus dictum at tempor commodo ullamcorper. Fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate.
+</p>
+<p>
+  Lectus proin nibh nisl condimentum id venenatis a condimentum. Id consectetur purus ut faucibus pulvinar elementum integer enim. Non pulvinar neque laoreet suspendisse interdum consectetur. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus. Suscipit tellus mauris a diam maecenas sed enim ut sem. Dolor purus non enim praesent elementum facilisis. Non enim praesent elementum facilisis leo vel. Ultricies leo integer malesuada nunc vel risus commodo viverra maecenas. Nulla porttitor massa id neque aliquam vestibulum. Erat velit scelerisque in dictum non consectetur. Amet cursus sit amet dictum. Nec tincidunt praesent semper feugiat nibh. Rutrum quisque non tellus orci ac auctor. Sagittis aliquam malesuada bibendum arcu vitae elementum. Massa tincidunt dui ut ornare lectus sit amet est. Aliquet porttitor lacus luctus accumsan tortor posuere ac. Quis hendrerit dolor magna eget est lorem ipsum dolor sit. Lectus mauris ultrices eros in.
+</p>
+<p>
+  Massa massa ultricies mi quis hendrerit dolor magna. Est ullamcorper eget nulla facilisi etiam dignissim diam. Vulputate sapien nec sagittis aliquam malesuada. Nisi porta lorem mollis aliquam ut porttitor leo a diam. Tempus quam pellentesque nec nam. Faucibus vitae aliquet nec ullamcorper sit amet risus nullam eget. Gravida arcu ac tortor dignissim convallis aenean et tortor. A scelerisque purus semper eget duis at tellus at. Viverra ipsum nunc aliquet bibendum enim. Semper feugiat nibh sed pulvinar proin gravida hendrerit. Et ultrices neque ornare aenean euismod. Consequat semper viverra nam libero justo laoreet. Nunc mattis enim ut tellus elementum sagittis. Consectetur lorem donec massa sapien faucibus et. Vel risus commodo viverra maecenas accumsan lacus vel facilisis. Diam sollicitudin tempor id eu nisl nunc. Dolor magna eget est lorem ipsum dolor. Adipiscing elit pellentesque habitant morbi tristique.
+</p>
+<p>
+  Nec sagittis aliquam malesuada bibendum arcu vitae elementum curabitur. Egestas fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate sapien. Porttitor leo a diam sollicitudin tempor. Pellentesque dignissim enim sit amet venenatis urna cursus eget nunc. Posuere sollicitudin aliquam ultrices sagittis orci a scelerisque. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus. Leo urna molestie at elementum. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Libero id faucibus nisl tincidunt eget nullam. Tellus elementum sagittis vitae et leo duis ut diam. Sodales ut etiam sit amet nisl purus in mollis. Ipsum faucibus vitae aliquet nec ullamcorper sit amet risus. Lacus laoreet non curabitur gravida arcu ac tortor dignissim convallis. Aliquam malesuada bibendum arcu vitae elementum. Leo vel orci porta non pulvinar neque laoreet. Ipsum suspendisse ultrices gravida dictum fusce.
+</p>
+<p>
+  Egestas erat imperdiet sed euismod nisi porta lorem. Venenatis a condimentum vitae sapien pellentesque habitant. Sit amet luctus venenatis lectus magna fringilla urna porttitor. Orci sagittis eu volutpat odio facilisis mauris sit amet massa. Ut enim blandit volutpat maecenas volutpat blandit aliquam. Libero volutpat sed cras ornare. Molestie ac feugiat sed lectus vestibulum mattis ullamcorper velit sed. Diam quis enim lobortis scelerisque fermentum dui. Pellentesque habitant morbi tristique senectus et netus. Auctor urna nunc id cursus metus aliquam eleifend. Elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi tristique. Sed risus ultricies tristique nulla aliquet enim tortor. Tincidunt arcu non sodales neque sodales ut. Sed lectus vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt.
+</p>
+<p>
+  Pulvinar etiam non quam lacus suspendisse faucibus. Eu mi bibendum neque egestas congue. Egestas purus viverra accumsan in nisl nisi scelerisque eu. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Eu non diam phasellus vestibulum. Semper feugiat nibh sed pulvinar. Ante in nibh mauris cursus mattis molestie a. Maecenas accumsan lacus vel facilisis volutpat. Non quam lacus suspendisse faucibus. Quis commodo odio aenean sed adipiscing. Vel elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi. Sed cras ornare arcu dui vivamus arcu felis. Tortor vitae purus faucibus ornare suspendisse sed. Morbi tincidunt ornare massa eget egestas purus viverra. Nibh cras pulvinar mattis nunc. Luctus venenatis lectus magna fringilla urna porttitor. Enim blandit volutpat maecenas volutpat blandit aliquam etiam erat. Malesuada pellentesque elit eget gravida cum sociis natoque penatibus et. Felis eget nunc lobortis mattis aliquam faucibus purus in. Vivamus arcu felis bibendum ut.
+</p>
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.scss b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
new file mode 100644
index 00000000000..d2290cd01c3
--- /dev/null
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
@@ -0,0 +1,27 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { EndUserAgreementContentComponent } from './end-user-agreement-content.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+
+describe('EndUserAgreementContentComponent', () => {
+  let component: EndUserAgreementContentComponent;
+  let fixture: ComponentFixture<EndUserAgreementContentComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [ TranslateModule.forRoot() ],
+      declarations: [ EndUserAgreementContentComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EndUserAgreementContentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
new file mode 100644
index 00000000000..faa7d5a78f2
--- /dev/null
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-end-user-agreement-content',
+  templateUrl: './end-user-agreement-content.component.html',
+  styleUrls: ['./end-user-agreement-content.component.scss']
+})
+/**
+ * Component displaying the contents of the End User Agreement
+ */
+export class EndUserAgreementContentComponent {
+}
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
new file mode 100644
index 00000000000..2ab0005c69f
--- /dev/null
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -0,0 +1,13 @@
+<div class="container">
+  <ds-end-user-agreement-content></ds-end-user-agreement-content>
+
+  <form class="form-user-agreement-accept mt-4" (ngSubmit)="submit()" novalidate>
+    <input class="ml-1 mr-2" type="checkbox" id="user-agreement-accept" [(ngModel)]="accepted" [ngModelOptions]="{standalone: true}">
+    <label class="col-form-label-lg" for="user-agreement-accept">{{ 'info.end-user-agreement.accept' | translate }}</label>
+
+    <div class="d-flex mt-4">
+      <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
+      <button id="button-save" type="submit" class="btn btn-primary" [disabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
+    </div>
+  </form>
+</div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.scss b/src/app/info/end-user-agreement/end-user-agreement.component.scss
new file mode 100644
index 00000000000..2960a0fac13
--- /dev/null
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.scss
@@ -0,0 +1,8 @@
+input#user-agreement-accept {
+  /* Large-sized Checkboxes */
+  -ms-transform: scale(1.6); /* IE */
+  -moz-transform: scale(1.6); /* FF */
+  -webkit-transform: scale(1.6); /* Safari and Chrome */
+  -o-transform: scale(1.6); /* Opera */
+  padding: 10px;
+}
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
new file mode 100644
index 00000000000..c0957fa7bab
--- /dev/null
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -0,0 +1,156 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { EndUserAgreementComponent } from './end-user-agreement.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateModule } from '@ngx-translate/core';
+import { AuthService } from '../../core/auth/auth.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { Store } from '@ngrx/store';
+import { By } from '@angular/platform-browser';
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+
+describe('EndUserAgreementComponent', () => {
+  let component: EndUserAgreementComponent;
+  let fixture: ComponentFixture<EndUserAgreementComponent>;
+
+  let endUserAgreementService: EndUserAgreementService;
+  let notificationsService: NotificationsService;
+  let authService: AuthService;
+  let store;
+  let router: Router;
+  let route: ActivatedRoute;
+
+  let redirectUrl;
+
+  function init() {
+    redirectUrl = 'redirect/url';
+
+    endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
+      hasCurrentUserOrCookieAcceptedAgreement : observableOf(false),
+      setUserAcceptedAgreement: observableOf(true)
+    });
+    notificationsService = jasmine.createSpyObj('notificationsService', ['success', 'error']);
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true)
+    });
+    store = jasmine.createSpyObj('store', ['dispatch']);
+    router = jasmine.createSpyObj('router', ['navigate', 'navigateByUrl']);
+    route = Object.assign(new ActivatedRouteStub(), {
+      queryParams: observableOf({
+        redirect: redirectUrl
+      })
+    }) as any;
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [ TranslateModule.forRoot() ],
+      declarations: [ EndUserAgreementComponent ],
+      providers: [
+        { provide: EndUserAgreementService, useValue: endUserAgreementService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: AuthService, useValue: authService },
+        { provide: Store, useValue: store },
+        { provide: Router, useValue: router },
+        { provide: ActivatedRoute, useValue: route }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EndUserAgreementComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('when the user hasn\'t accepted the agreement', () => {
+    beforeEach(() => {
+      (endUserAgreementService.hasCurrentUserOrCookieAcceptedAgreement as jasmine.Spy).and.returnValue(observableOf(false));
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should initialize the accepted property', () => {
+      expect(component.accepted).toEqual(false);
+    });
+
+    it('should disable the save button', () => {
+      const button = fixture.debugElement.query(By.css('#button-save')).nativeElement;
+      expect(button.disabled).toBeTruthy();
+    });
+  });
+
+  describe('when the user has accepted the agreement', () => {
+    beforeEach(() => {
+      (endUserAgreementService.hasCurrentUserOrCookieAcceptedAgreement as jasmine.Spy).and.returnValue(observableOf(true));
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should initialize the accepted property', () => {
+      expect(component.accepted).toEqual(true);
+    });
+
+    it('should enable the save button', () => {
+      const button = fixture.debugElement.query(By.css('#button-save')).nativeElement;
+      expect(button.disabled).toBeFalsy();
+    });
+
+    describe('submit', () => {
+      describe('when accepting the agreement was successful', () => {
+        beforeEach(() => {
+          (endUserAgreementService.setUserAcceptedAgreement as jasmine.Spy).and.returnValue(observableOf(true));
+          component.submit();
+        });
+
+        it('should display a success notification', () => {
+          expect(notificationsService.success).toHaveBeenCalled();
+        });
+
+        it('should navigate the user to the redirect url', () => {
+          expect(router.navigateByUrl).toHaveBeenCalledWith(redirectUrl);
+        });
+      });
+
+      describe('when accepting the agreement was unsuccessful', () => {
+        beforeEach(() => {
+          (endUserAgreementService.setUserAcceptedAgreement as jasmine.Spy).and.returnValue(observableOf(false));
+          component.submit();
+        });
+
+        it('should display an error notification', () => {
+          expect(notificationsService.error).toHaveBeenCalled();
+        });
+      });
+    });
+  });
+
+  describe('cancel', () => {
+    describe('when the user is authenticated', () => {
+      beforeEach(() => {
+        (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(true));
+        component.cancel();
+      });
+
+      it('should logout the user', () => {
+        expect(store.dispatch).toHaveBeenCalledWith(new LogOutAction());
+      });
+    });
+
+    describe('when the user is not authenticated', () => {
+      beforeEach(() => {
+        (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false));
+        component.cancel();
+      });
+
+      it('should navigate the user to the homepage', () => {
+        expect(router.navigate).toHaveBeenCalledWith(['home']);
+      });
+    });
+  });
+});
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
new file mode 100644
index 00000000000..a3350319ba8
--- /dev/null
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -0,0 +1,92 @@
+import { Component, OnInit } from '@angular/core';
+import { AuthService } from '../../core/auth/auth.service';
+import { map, switchMap, take } from 'rxjs/operators';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { AppState } from '../../app.reducer';
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { isNotEmpty } from '../../shared/empty.util';
+
+@Component({
+  selector: 'ds-end-user-agreement',
+  templateUrl: './end-user-agreement.component.html',
+  styleUrls: ['./end-user-agreement.component.scss']
+})
+/**
+ * Component displaying the End User Agreement and an option to accept it
+ */
+export class EndUserAgreementComponent implements OnInit {
+
+  /**
+   * Whether or not the user agreement has been accepted
+   */
+  accepted = false;
+
+  constructor(protected endUserAgreementService: EndUserAgreementService,
+              protected notificationsService: NotificationsService,
+              protected translate: TranslateService,
+              protected authService: AuthService,
+              protected store: Store<AppState>,
+              protected router: Router,
+              protected route: ActivatedRoute) {
+  }
+
+  /**
+   * Initialize the component
+   */
+  ngOnInit(): void {
+    this.initAccepted();
+  }
+
+  /**
+   * Initialize the "accepted" property of this component by checking if the current user has accepted it before
+   */
+  initAccepted() {
+    this.endUserAgreementService.hasCurrentUserOrCookieAcceptedAgreement(false).subscribe((accepted) => {
+      this.accepted = accepted;
+    });
+  }
+
+  /**
+   * Submit the form
+   * Set the End User Agreement, display a notification and (optionally) redirect the user back to their original destination
+   */
+  submit() {
+    this.endUserAgreementService.setUserAcceptedAgreement(this.accepted).pipe(
+      switchMap((success) => {
+        if (success) {
+          this.notificationsService.success(this.translate.instant('info.end-user-agreement.accept.success'));
+          return this.route.queryParams.pipe(map((params) => params.redirect));
+        } else {
+          this.notificationsService.error(this.translate.instant('info.end-user-agreement.accept.error'));
+          return observableOf(undefined);
+        }
+      }),
+      take(1)
+    ).subscribe((redirectUrl) => {
+      if (isNotEmpty(redirectUrl)) {
+        this.router.navigateByUrl(decodeURIComponent(redirectUrl));
+      }
+    });
+  }
+
+  /**
+   * Cancel the agreement
+   * If the user is logged in, this will log him/her out
+   * If the user is not logged in, they will be redirected to the homepage
+   */
+  cancel() {
+    this.authService.isAuthenticated().pipe(take(1)).subscribe((authenticated) => {
+      if (authenticated) {
+        this.store.dispatch(new LogOutAction());
+      } else {
+        this.router.navigate(['home']);
+      }
+    });
+  }
+
+}
diff --git a/src/app/info/info-routing-paths.ts b/src/app/info/info-routing-paths.ts
new file mode 100644
index 00000000000..8ec6dbcb8de
--- /dev/null
+++ b/src/app/info/info-routing-paths.ts
@@ -0,0 +1,16 @@
+import { getInfoModulePath } from '../app-routing-paths';
+
+export const END_USER_AGREEMENT_PATH = 'end-user-agreement';
+export const PRIVACY_PATH = 'privacy';
+
+export function getEndUserAgreementPath() {
+    return getSubPath(END_USER_AGREEMENT_PATH);
+}
+
+export function getPrivacyPath() {
+    return getSubPath(PRIVACY_PATH);
+}
+
+function getSubPath(path: string) {
+    return `${getInfoModulePath()}/${path}`;
+}
diff --git a/src/app/info/info-routing.module.ts b/src/app/info/info-routing.module.ts
new file mode 100644
index 00000000000..799572f9b93
--- /dev/null
+++ b/src/app/info/info-routing.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { PrivacyComponent } from './privacy/privacy.component';
+import { PRIVACY_PATH, END_USER_AGREEMENT_PATH } from './info-routing-paths';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: END_USER_AGREEMENT_PATH,
+        component: EndUserAgreementComponent,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' }
+      }
+    ]),
+    RouterModule.forChild([
+      {
+        path: PRIVACY_PATH,
+        component: PrivacyComponent,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' }
+      }
+    ])
+  ]
+})
+/**
+ * Module for navigating to components within the info module
+ */
+export class InfoRoutingModule {
+}
diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts
new file mode 100644
index 00000000000..ae8ef89b27e
--- /dev/null
+++ b/src/app/info/info.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component';
+import { InfoRoutingModule } from './info-routing.module';
+import { EndUserAgreementContentComponent } from './end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
+import { PrivacyComponent } from './privacy/privacy.component';
+import { PrivacyContentComponent } from './privacy/privacy-content/privacy-content.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    InfoRoutingModule
+  ],
+  declarations: [
+    EndUserAgreementComponent,
+    EndUserAgreementContentComponent,
+    PrivacyComponent,
+    PrivacyContentComponent
+  ]
+})
+export class InfoModule {
+}
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.html b/src/app/info/privacy/privacy-content/privacy-content.component.html
new file mode 100644
index 00000000000..a5bbb3fe10f
--- /dev/null
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -0,0 +1,37 @@
+<h2>{{ 'info.privacy.head' | translate }}</h2>
+<p>
+  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Nunc sed velit dignissim sodales ut eu. In ante metus dictum at tempor. Diam phasellus vestibulum lorem sed risus. Sed cras ornare arcu dui vivamus. Sit amet consectetur adipiscing elit pellentesque. Id velit ut tortor pretium viverra suspendisse potenti. Sed euismod nisi porta lorem mollis aliquam ut. Justo laoreet sit amet cursus sit amet dictum sit. Ullamcorper morbi tincidunt ornare massa eget egestas.
+</p>
+<p>
+  In iaculis nunc sed augue lacus. Curabitur vitae nunc sed velit dignissim sodales ut eu sem. Tellus id interdum velit laoreet id donec ultrices tincidunt arcu. Quis vel eros donec ac odio tempor. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Varius quam quisque id diam vel quam. Nisl tincidunt eget nullam non nisi est sit. Nunc aliquet bibendum enim facilisis. Aenean sed adipiscing diam donec adipiscing. Convallis tellus id interdum velit laoreet. Massa placerat duis ultricies lacus sed turpis tincidunt. Sed cras ornare arcu dui vivamus arcu. Egestas integer eget aliquet nibh praesent tristique. Sit amet purus gravida quis blandit turpis cursus in hac. Porta non pulvinar neque laoreet suspendisse. Quis risus sed vulputate odio ut. Dignissim enim sit amet venenatis urna cursus.
+</p>
+<p>
+  Interdum velit laoreet id donec ultrices tincidunt arcu non sodales. Massa sapien faucibus et molestie. Dictumst vestibulum rhoncus est pellentesque elit ullamcorper. Metus dictum at tempor commodo ullamcorper. Tincidunt lobortis feugiat vivamus at augue eget. Non diam phasellus vestibulum lorem sed risus ultricies. Neque aliquam vestibulum morbi blandit cursus risus at ultrices mi. Euismod lacinia at quis risus sed. Lorem mollis aliquam ut porttitor leo a diam. Ipsum dolor sit amet consectetur. Ante in nibh mauris cursus mattis molestie a iaculis at. Commodo ullamcorper a lacus vestibulum. Pellentesque elit eget gravida cum sociis. Sit amet commodo nulla facilisi nullam vehicula. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus aenean.
+</p>
+<p>
+  Ac turpis egestas maecenas pharetra convallis. Lacus sed viverra tellus in. Nullam eget felis eget nunc lobortis mattis aliquam faucibus purus. Id aliquet risus feugiat in ante metus dictum at. Quis enim lobortis scelerisque fermentum dui faucibus. Eu volutpat odio facilisis mauris sit amet massa vitae tortor. Tellus elementum sagittis vitae et leo. Cras sed felis eget velit aliquet sagittis. Proin fermentum leo vel orci porta non pulvinar neque laoreet. Dui sapien eget mi proin sed libero enim. Ultrices mi tempus imperdiet nulla malesuada. Mattis molestie a iaculis at. Turpis massa sed elementum tempus egestas.
+</p>
+<p>
+  Dui faucibus in ornare quam viverra orci sagittis eu volutpat. Cras adipiscing enim eu turpis. Ac felis donec et odio pellentesque. Iaculis nunc sed augue lacus viverra vitae congue eu consequat. Posuere lorem ipsum dolor sit amet consectetur adipiscing elit duis. Elit eget gravida cum sociis natoque penatibus. Id faucibus nisl tincidunt eget nullam non. Sagittis aliquam malesuada bibendum arcu vitae. Fermentum leo vel orci porta. Aliquam ultrices sagittis orci a scelerisque purus semper. Diam maecenas sed enim ut sem viverra aliquet eget sit. Et ultrices neque ornare aenean euismod. Eu mi bibendum neque egestas congue quisque egestas diam. Eget lorem dolor sed viverra. Ut lectus arcu bibendum at. Rutrum tellus pellentesque eu tincidunt tortor. Vitae congue eu consequat ac. Elit ullamcorper dignissim cras tincidunt. Sit amet volutpat consequat mauris nunc congue nisi.
+</p>
+<p>
+  Cursus in hac habitasse platea dictumst quisque sagittis purus. Placerat duis ultricies lacus sed turpis tincidunt. In egestas erat imperdiet sed euismod nisi porta lorem mollis. Non nisi est sit amet facilisis magna. In massa tempor nec feugiat nisl pretium fusce. Pulvinar neque laoreet suspendisse interdum consectetur. Ullamcorper morbi tincidunt ornare massa eget egestas purus viverra accumsan. Fringilla urna porttitor rhoncus dolor purus non enim. Mauris nunc congue nisi vitae suscipit. Commodo elit at imperdiet dui accumsan sit amet nulla. Tempor id eu nisl nunc mi ipsum faucibus. Porta non pulvinar neque laoreet suspendisse. Nec nam aliquam sem et tortor consequat.
+</p>
+<p>
+  Eget nunc lobortis mattis aliquam faucibus purus. Odio tempor orci dapibus ultrices. Sed nisi lacus sed viverra tellus. Elit ullamcorper dignissim cras tincidunt. Porttitor rhoncus dolor purus non enim praesent elementum facilisis. Viverra orci sagittis eu volutpat odio. Pharetra massa massa ultricies mi quis. Lectus vestibulum mattis ullamcorper velit sed ullamcorper. Pulvinar neque laoreet suspendisse interdum consectetur. Vitae auctor eu augue ut. Arcu dictum varius duis at consectetur lorem donec. Massa sed elementum tempus egestas sed sed. Risus viverra adipiscing at in tellus integer. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Pharetra massa massa ultricies mi. Elementum eu facilisis sed odio morbi quis commodo odio. Tincidunt lobortis feugiat vivamus at. Felis donec et odio pellentesque diam volutpat commodo sed. Risus feugiat in ante metus dictum at tempor commodo ullamcorper. Fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate.
+</p>
+<p>
+  Lectus proin nibh nisl condimentum id venenatis a condimentum. Id consectetur purus ut faucibus pulvinar elementum integer enim. Non pulvinar neque laoreet suspendisse interdum consectetur. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus. Suscipit tellus mauris a diam maecenas sed enim ut sem. Dolor purus non enim praesent elementum facilisis. Non enim praesent elementum facilisis leo vel. Ultricies leo integer malesuada nunc vel risus commodo viverra maecenas. Nulla porttitor massa id neque aliquam vestibulum. Erat velit scelerisque in dictum non consectetur. Amet cursus sit amet dictum. Nec tincidunt praesent semper feugiat nibh. Rutrum quisque non tellus orci ac auctor. Sagittis aliquam malesuada bibendum arcu vitae elementum. Massa tincidunt dui ut ornare lectus sit amet est. Aliquet porttitor lacus luctus accumsan tortor posuere ac. Quis hendrerit dolor magna eget est lorem ipsum dolor sit. Lectus mauris ultrices eros in.
+</p>
+<p>
+  Massa massa ultricies mi quis hendrerit dolor magna. Est ullamcorper eget nulla facilisi etiam dignissim diam. Vulputate sapien nec sagittis aliquam malesuada. Nisi porta lorem mollis aliquam ut porttitor leo a diam. Tempus quam pellentesque nec nam. Faucibus vitae aliquet nec ullamcorper sit amet risus nullam eget. Gravida arcu ac tortor dignissim convallis aenean et tortor. A scelerisque purus semper eget duis at tellus at. Viverra ipsum nunc aliquet bibendum enim. Semper feugiat nibh sed pulvinar proin gravida hendrerit. Et ultrices neque ornare aenean euismod. Consequat semper viverra nam libero justo laoreet. Nunc mattis enim ut tellus elementum sagittis. Consectetur lorem donec massa sapien faucibus et. Vel risus commodo viverra maecenas accumsan lacus vel facilisis. Diam sollicitudin tempor id eu nisl nunc. Dolor magna eget est lorem ipsum dolor. Adipiscing elit pellentesque habitant morbi tristique.
+</p>
+<p>
+  Nec sagittis aliquam malesuada bibendum arcu vitae elementum curabitur. Egestas fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate sapien. Porttitor leo a diam sollicitudin tempor. Pellentesque dignissim enim sit amet venenatis urna cursus eget nunc. Posuere sollicitudin aliquam ultrices sagittis orci a scelerisque. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus. Leo urna molestie at elementum. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Libero id faucibus nisl tincidunt eget nullam. Tellus elementum sagittis vitae et leo duis ut diam. Sodales ut etiam sit amet nisl purus in mollis. Ipsum faucibus vitae aliquet nec ullamcorper sit amet risus. Lacus laoreet non curabitur gravida arcu ac tortor dignissim convallis. Aliquam malesuada bibendum arcu vitae elementum. Leo vel orci porta non pulvinar neque laoreet. Ipsum suspendisse ultrices gravida dictum fusce.
+</p>
+<p>
+  Egestas erat imperdiet sed euismod nisi porta lorem. Venenatis a condimentum vitae sapien pellentesque habitant. Sit amet luctus venenatis lectus magna fringilla urna porttitor. Orci sagittis eu volutpat odio facilisis mauris sit amet massa. Ut enim blandit volutpat maecenas volutpat blandit aliquam. Libero volutpat sed cras ornare. Molestie ac feugiat sed lectus vestibulum mattis ullamcorper velit sed. Diam quis enim lobortis scelerisque fermentum dui. Pellentesque habitant morbi tristique senectus et netus. Auctor urna nunc id cursus metus aliquam eleifend. Elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi tristique. Sed risus ultricies tristique nulla aliquet enim tortor. Tincidunt arcu non sodales neque sodales ut. Sed lectus vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt.
+</p>
+<p>
+  Pulvinar etiam non quam lacus suspendisse faucibus. Eu mi bibendum neque egestas congue. Egestas purus viverra accumsan in nisl nisi scelerisque eu. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Eu non diam phasellus vestibulum. Semper feugiat nibh sed pulvinar. Ante in nibh mauris cursus mattis molestie a. Maecenas accumsan lacus vel facilisis volutpat. Non quam lacus suspendisse faucibus. Quis commodo odio aenean sed adipiscing. Vel elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi. Sed cras ornare arcu dui vivamus arcu felis. Tortor vitae purus faucibus ornare suspendisse sed. Morbi tincidunt ornare massa eget egestas purus viverra. Nibh cras pulvinar mattis nunc. Luctus venenatis lectus magna fringilla urna porttitor. Enim blandit volutpat maecenas volutpat blandit aliquam etiam erat. Malesuada pellentesque elit eget gravida cum sociis natoque penatibus et. Felis eget nunc lobortis mattis aliquam faucibus purus in. Vivamus arcu felis bibendum ut.
+</p>
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.scss b/src/app/info/privacy/privacy-content/privacy-content.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts b/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
new file mode 100644
index 00000000000..a77e809dc34
--- /dev/null
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
@@ -0,0 +1,27 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PrivacyContentComponent } from './privacy-content.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+
+describe('PrivacyContentComponent', () => {
+  let component: PrivacyContentComponent;
+  let fixture: ComponentFixture<PrivacyContentComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [ TranslateModule.forRoot() ],
+      declarations: [ PrivacyContentComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PrivacyContentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.ts b/src/app/info/privacy/privacy-content/privacy-content.component.ts
new file mode 100644
index 00000000000..6a7b394cf49
--- /dev/null
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-privacy-content',
+  templateUrl: './privacy-content.component.html',
+  styleUrls: ['./privacy-content.component.scss']
+})
+/**
+ * Component displaying the contents of the Privacy Statement
+ */
+export class PrivacyContentComponent {
+}
diff --git a/src/app/info/privacy/privacy.component.html b/src/app/info/privacy/privacy.component.html
new file mode 100644
index 00000000000..c6772e98f26
--- /dev/null
+++ b/src/app/info/privacy/privacy.component.html
@@ -0,0 +1,3 @@
+<div class="container">
+  <ds-privacy-content></ds-privacy-content>
+</div>
diff --git a/src/app/info/privacy/privacy.component.scss b/src/app/info/privacy/privacy.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/info/privacy/privacy.component.spec.ts b/src/app/info/privacy/privacy.component.spec.ts
new file mode 100644
index 00000000000..a3d47e82f9c
--- /dev/null
+++ b/src/app/info/privacy/privacy.component.spec.ts
@@ -0,0 +1,27 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PrivacyComponent } from './privacy.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+
+describe('PrivacyComponent', () => {
+  let component: PrivacyComponent;
+  let fixture: ComponentFixture<PrivacyComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [ TranslateModule.forRoot() ],
+      declarations: [ PrivacyComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PrivacyComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/info/privacy/privacy.component.ts b/src/app/info/privacy/privacy.component.ts
new file mode 100644
index 00000000000..dc9d3d69dcd
--- /dev/null
+++ b/src/app/info/privacy/privacy.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-privacy',
+  templateUrl: './privacy.component.html',
+  styleUrls: ['./privacy.component.scss']
+})
+/**
+ * Component displaying the Privacy Statement
+ */
+export class PrivacyComponent {
+}
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 258c8b6c113..a7cf7c1856a 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -5,13 +5,13 @@
        id="browseDropdown" (click)="toggleSection($event)"
        data-toggle="dropdown">
         <ng-container
-                *ngComponentOutlet="itemComponents.get(section.id); injector: itemInjectors.get(section.id);"></ng-container>
+                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
     </a>
     <ul @slide *ngIf="(active | async)" (click)="deactivateSection($event)"
         class="m-0 shadow-none border-top-0 dropdown-menu show">
-        <ng-container *ngFor="let subSection of (subSections | async)">
+        <ng-container *ngFor="let subSection of (subSections$ | async)">
             <ng-container
-                    *ngComponentOutlet="itemComponents.get(subSection.id); injector: itemInjectors.get(subSection.id);"></ng-container>
+                    *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
         </ng-container>
     </ul>
-</li>
\ No newline at end of file
+</li>
diff --git a/src/app/navbar/navbar-section/navbar-section.component.html b/src/app/navbar/navbar-section/navbar-section.component.html
index b257a7bd57e..00461995bc8 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.html
+++ b/src/app/navbar/navbar-section/navbar-section.component.html
@@ -1,4 +1,4 @@
 <li class="nav-item">
   <ng-container
-          *ngComponentOutlet="itemComponents.get(section.id); injector: itemInjectors.get(section.id);"></ng-container>
-</li>
\ No newline at end of file
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+</li>
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index eb6164b26f5..2356077e431 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -7,7 +7,7 @@
                 <ul class="navbar-nav mr-auto shadow-none">
                     <ng-container *ngFor="let section of (sections | async)">
                         <ng-container
-                                *ngComponentOutlet="sectionComponents.get(section.id); injector: sectionInjectors.get(section.id);"></ng-container>
+                                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
                     </ng-container>
                 </ul>
             </div>
diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/navbar/navbar.component.spec.ts
index 206afda0038..907ddc8b878 100644
--- a/src/app/navbar/navbar.component.spec.ts
+++ b/src/app/navbar/navbar.component.spec.ts
@@ -11,6 +11,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Injector, NO_ERRORS_SCHEMA } from '@angular/core';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
 let comp: NavbarComponent;
 let fixture: ComponentFixture<NavbarComponent>;
@@ -24,12 +26,14 @@ describe('NavbarComponent', () => {
       imports: [
         TranslateModule.forRoot(),
         NoopAnimationsModule,
-        ReactiveFormsModule],
+        ReactiveFormsModule,
+        RouterTestingModule],
       declarations: [NavbarComponent],
       providers: [
         { provide: Injector, useValue: {} },
         { provide: MenuService, useValue: menuService },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+        { provide: ActivatedRoute, useValue: {} }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     })
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 6055aac263e..454b68a81cd 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -17,7 +17,7 @@ import { environment } from '../../environments/environment';
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav]
 })
-export class NavbarComponent extends MenuComponent implements OnInit {
+export class NavbarComponent extends MenuComponent {
   /**
    * The menu ID of the Navbar is PUBLIC
    * @type {MenuID.PUBLIC}
@@ -64,19 +64,6 @@ export class NavbarComponent extends MenuComponent implements OnInit {
           link: `/community-list`
         } as LinkMenuItemModel
       },
-
-      /* Statistics */
-      {
-        id: 'statistics',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.statistics',
-          link: ''
-        } as LinkMenuItemModel,
-        index: 2
-      },
     ];
     // Read the different Browse-By types from config and add them to the browse menu
     const types = environment.browseBy.types;
@@ -93,7 +80,9 @@ export class NavbarComponent extends MenuComponent implements OnInit {
         } as LinkMenuItemModel
       });
     });
-    menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, menuSection));
+    menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, Object.assign(menuSection, {
+      shouldPersistOnRouteChange: true
+    })));
 
   }
 
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
new file mode 100644
index 00000000000..ce26008c28d
--- /dev/null
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
@@ -0,0 +1,2 @@
+<h4 class="mt-4">{{title | translate}}</h4>
+<ng-content></ng-content>
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
new file mode 100644
index 00000000000..487adb2ac00
--- /dev/null
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
@@ -0,0 +1,38 @@
+import { ProcessDetailFieldComponent } from './process-detail-field.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+describe('ProcessDetailFieldComponent', () => {
+  let component: ProcessDetailFieldComponent;
+  let fixture: ComponentFixture<ProcessDetailFieldComponent>;
+
+  let title;
+
+  beforeEach(async(() => {
+    title = 'fake.title.message';
+
+    TestBed.configureTestingModule({
+      declarations: [ProcessDetailFieldComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessDetailFieldComponent);
+    component = fixture.componentInstance;
+    component.title = title;
+    fixture.detectChanges();
+  });
+
+  it('should display the given title', () => {
+    const header = fixture.debugElement.query(By.css('h4')).nativeElement;
+    expect(header.textContent).toContain(title);
+  });
+});
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
new file mode 100644
index 00000000000..f8015b67885
--- /dev/null
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
@@ -0,0 +1,15 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ds-process-detail-field',
+  templateUrl: './process-detail-field.component.html',
+})
+/**
+ * A component displaying a single detail about a DSpace Process
+ */
+export class ProcessDetailFieldComponent {
+  /**
+   * I18n message for the header
+   */
+  @Input() title: string;
+}
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
new file mode 100644
index 00000000000..d59f93254e3
--- /dev/null
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -0,0 +1,53 @@
+<div class="container" *ngVar="(processRD$ | async)?.payload as process">
+    <div class="d-flex">
+        <h2 class="flex-grow-1">{{'process.detail.title' | translate:{id: process?.processId, name: process?.scriptName} }}</h2>
+        <div>
+            <a class="btn btn-light" [routerLink]="'/processes/new'" [queryParams]="{id: process?.processId}">{{'process.detail.create' | translate}}</a>
+        </div>
+    </div>
+    <ds-process-detail-field id="process-name" [title]="'process.detail.script'">
+        <div>{{ process?.scriptName }}</div>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field *ngIf="process?.parameters && process?.parameters?.length > 0" id="process-arguments" [title]="'process.detail.arguments'">
+        <div *ngFor="let argument of process?.parameters">{{ argument?.name }} {{ argument?.value }}</div>
+    </ds-process-detail-field>
+
+    <div *ngVar="(filesRD$ | async)?.payload?.page as files">
+        <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files" [title]="'process.detail.output-files'">
+          <ds-file-download-link *ngFor="let file of files; let last=last;" [href]="file?._links?.content?.href" [download]="getFileName(file)">
+            <span>{{getFileName(file)}}</span>
+            <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+          </ds-file-download-link>
+        </ds-process-detail-field>
+    </div>
+
+    <ds-process-detail-field *ngIf="process && process.startTime" id="process-start-time" [title]="'process.detail.start-time' | translate">
+        <div>{{ process.startTime }}</div>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field *ngIf="process && process.endTime" id="process-end-time" [title]="'process.detail.end-time' | translate">
+        <div>{{ process.endTime }}</div>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field *ngIf="process && process.processStatus" id="process-status" [title]="'process.detail.status' | translate">
+        <div>{{ process.processStatus }}</div>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field *ngIf="isProcessFinished(process)" id="process-output" [title]="'process.detail.output'">
+      <button *ngIf="!showOutputLogs && process?._links?.output?.href != undefined" id="showOutputButton" class="btn btn-light" (click)="showProcessOutputLogs()">
+        {{ 'process.detail.logs.button' | translate }}
+      </button>
+      <ds-loading *ngIf="retrievingOutputLogs$ | async" class="ds-loading" message="{{ 'process.detail.logs.loading' | translate }}"></ds-loading>
+      <pre class="font-weight-bold text-secondary bg-light p-3"
+           *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
+      <p id="no-output-logs-message" *ngIf="(!(retrievingOutputLogs$ | async) && showOutputLogs)
+      && !(outputLogs$ | async) || (outputLogs$ | async)?.length == 0 || !process._links.output">
+        {{ 'process.detail.logs.none' | translate }}
+      </p>
+    </ds-process-detail-field>
+
+    <div>
+      <a class="btn btn-light mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
+    </div>
+</div>
diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts
new file mode 100644
index 00000000000..b81eedabad3
--- /dev/null
+++ b/src/app/process-page/detail/process-detail.component.spec.ts
@@ -0,0 +1,210 @@
+import { HttpClient } from '@angular/common/http';
+import { AuthService } from '../../core/auth/auth.service';
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
+import { ProcessDetailComponent } from './process-detail.component';
+import {
+  async,
+  ComponentFixture,
+  discardPeriodicTasks,
+  fakeAsync,
+  flush,
+  flushMicrotasks,
+  TestBed,
+  tick
+} from '@angular/core/testing';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component';
+import { Process } from '../processes/process.model';
+import { ActivatedRoute } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { By } from '@angular/platform-browser';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+
+describe('ProcessDetailComponent', () => {
+  let component: ProcessDetailComponent;
+  let fixture: ComponentFixture<ProcessDetailComponent>;
+
+  let processService: ProcessDataService;
+  let nameService: DSONameService;
+  let bitstreamDataService: BitstreamDataService;
+  let httpClient: HttpClient;
+
+  let process: Process;
+  let fileName: string;
+  let files: Bitstream[];
+
+  let processOutput;
+
+  function init() {
+    processOutput = 'Process Started'
+    process = Object.assign(new Process(), {
+      processId: 1,
+      scriptName: 'script-name',
+      processStatus: 'COMPLETED',
+      parameters: [
+        {
+          name: '-f',
+          value: 'file.xml'
+        },
+        {
+          name: '-i',
+          value: 'identifier'
+        }
+      ],
+      _links: {
+        self: {
+          href: 'https://rest.api/processes/1'
+        },
+        output: {
+          href: 'https://rest.api/processes/1/output'
+        }
+      }
+    });
+    fileName = 'fake-file-name';
+    files = [
+      Object.assign(new Bitstream(), {
+        sizeBytes: 10000,
+        metadata: {
+          'dc.title': [
+            {
+              value: fileName,
+              language: null
+            }
+          ]
+        },
+        _links: {
+          content: { href: 'file-selflink' }
+        }
+      })
+    ];
+    const logBitstream = Object.assign(new Bitstream(), {
+      id: 'output.log',
+      _links: {
+        content: { href: 'log-selflink' }
+      }
+    });
+    processService = jasmine.createSpyObj('processService', {
+      getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files))
+    });
+    bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
+      findByHref: createSuccessfulRemoteDataObject$(logBitstream)
+    });
+    nameService = jasmine.createSpyObj('nameService', {
+      getName: fileName
+    });
+    httpClient = jasmine.createSpyObj('httpClient', {
+      get: observableOf(processOutput)
+    });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [ProcessDetailComponent, ProcessDetailFieldComponent, VarDirective, FileSizePipe],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) }
+        },
+        { provide: ProcessDataService, useValue: processService },
+        { provide: BitstreamDataService, useValue: bitstreamDataService },
+        { provide: DSONameService, useValue: nameService },
+        { provide: AuthService, useValue: new AuthServiceMock() },
+        { provide: HttpClient, useValue: httpClient },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessDetailComponent);
+    component = fixture.componentInstance;
+  });
+  afterEach(fakeAsync(() => {
+    TestBed.resetTestingModule();
+    fixture.destroy();
+    flush();
+    flushMicrotasks();
+    discardPeriodicTasks();
+    component = null;
+  }));
+
+  it('should display the script\'s name', () => {
+    fixture.detectChanges();
+    const name = fixture.debugElement.query(By.css('#process-name')).nativeElement;
+    expect(name.textContent).toContain(process.scriptName);
+  });
+
+  it('should display the process\'s parameters', () => {
+    fixture.detectChanges();
+    const args = fixture.debugElement.query(By.css('#process-arguments')).nativeElement;
+    process.parameters.forEach((param) => {
+      expect(args.textContent).toContain(`${param.name} ${param.value}`)
+    });
+  });
+
+  it('should display the process\'s output files', () => {
+    fixture.detectChanges();
+    const processFiles = fixture.debugElement.query(By.css('#process-files')).nativeElement;
+    expect(processFiles.textContent).toContain(fileName);
+  });
+
+  describe('if press show output logs', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'showProcessOutputLogs').and.callThrough();
+      fixture.detectChanges();
+
+      const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton'));
+      showOutputButton.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+    }));
+    it('should trigger showProcessOutputLogs', () => {
+      expect(component.showProcessOutputLogs).toHaveBeenCalled();
+    });
+    it('should display the process\'s output logs', () => {
+      fixture.detectChanges();
+      const outputProcess = fixture.debugElement.query(By.css('#process-output pre'));
+      expect(outputProcess.nativeElement.textContent).toContain(processOutput);
+    });
+  });
+
+  describe('if press show output logs and process has no output logs', () => {
+    beforeEach(fakeAsync(() => {
+      jasmine.getEnv().allowRespy(true);
+      spyOn(httpClient, 'get').and.returnValue(observableOf(null));
+      fixture = TestBed.createComponent(ProcessDetailComponent);
+      component = fixture.componentInstance;
+      spyOn(component, 'showProcessOutputLogs').and.callThrough();
+      fixture.detectChanges();
+      const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton'));
+      showOutputButton.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('should not display the process\'s output logs', () => {
+      const outputProcess = fixture.debugElement.query(By.css('#process-output pre'));
+      expect(outputProcess).toBeNull();
+    });
+    it('should display message saying there are no output logs', () => {
+      const noOutputProcess = fixture.debugElement.query(By.css('#no-output-logs-message')).nativeElement;
+      expect(noOutputProcess).toBeDefined();
+    });
+  });
+
+});
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
new file mode 100644
index 00000000000..4ed1112359f
--- /dev/null
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -0,0 +1,165 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, NgZone, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Observable } from 'rxjs/internal/Observable';
+import { finalize, map, mergeMap, switchMap, take, tap } from 'rxjs/operators';
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteDataPayload, redirectOn4xx } from '../../core/shared/operators';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { AlertType } from '../../shared/alert/aletr-type';
+import { hasValue } from '../../shared/empty.util';
+import { ProcessStatus } from '../processes/process-status.model';
+import { Process } from '../processes/process.model';
+
+@Component({
+  selector: 'ds-process-detail',
+  templateUrl: './process-detail.component.html',
+})
+/**
+ * A component displaying detailed information about a DSpace Process
+ */
+export class ProcessDetailComponent implements OnInit {
+
+  /**
+   * The AlertType enumeration
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * The Process's Remote Data
+   */
+  processRD$: Observable<RemoteData<Process>>;
+
+  /**
+   * The Process's Output Files
+   */
+  filesRD$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  /**
+   * File link that contain the output logs with auth token
+   */
+  outputLogFileUrl$: Observable<string>;
+
+  /**
+   * The Process's Output logs
+   */
+  outputLogs$: Observable<string>;
+
+  /**
+   * Boolean on whether or not to show the output logs
+   */
+  showOutputLogs;
+  /**
+   * When it's retrieving the output logs from backend, to show loading component
+   */
+  retrievingOutputLogs$: BehaviorSubject<boolean>;
+
+  constructor(protected route: ActivatedRoute,
+              protected router: Router,
+              protected processService: ProcessDataService,
+              protected bitstreamDataService: BitstreamDataService,
+              protected nameService: DSONameService,
+              private zone: NgZone,
+              protected authService: AuthService,
+              protected http: HttpClient) {
+  }
+
+  /**
+   * Initialize component properties
+   * Display a 404 if the process doesn't exist
+   */
+  ngOnInit(): void {
+    this.showOutputLogs = false;
+    this.retrievingOutputLogs$ = new BehaviorSubject<boolean>(false);
+    this.processRD$ = this.route.data.pipe(
+      map((data) => {
+        return data.process as RemoteData<Process>
+      }),
+      redirectOn4xx(this.router, this.authService)
+    );
+
+    this.filesRD$ = this.processRD$.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      switchMap((process: Process) => this.processService.getFiles(process.processId))
+    );
+  }
+
+  /**
+   * Get the name of a bitstream
+   * @param bitstream
+   */
+  getFileName(bitstream: Bitstream) {
+    return bitstream instanceof DSpaceObject ? this.nameService.getName(bitstream) : 'unknown';
+  }
+
+  /**
+   * Retrieves the process logs, while setting the loading subject to true.
+   * Sets the outputLogs when retrieved and sets the showOutputLogs boolean to show them and hide the button.
+   */
+  showProcessOutputLogs() {
+    this.retrievingOutputLogs$.next(true);
+    this.zone.runOutsideAngular(() => {
+      const processOutputRD$: Observable<RemoteData<Bitstream>> = this.processRD$.pipe(
+        getFirstSucceededRemoteDataPayload(),
+        switchMap((process: Process) => {
+          return this.bitstreamDataService.findByHref(process._links.output.href);
+        })
+      );
+      this.outputLogFileUrl$ = processOutputRD$.pipe(
+        tap((processOutputFileRD: RemoteData<Bitstream>) => {
+          if (processOutputFileRD.statusCode === 204) {
+            this.zone.run(() => this.retrievingOutputLogs$.next(false));
+            this.showOutputLogs = true;
+          }
+        }),
+        getFirstSucceededRemoteDataPayload(),
+        mergeMap((processOutput: Bitstream) => {
+          const url = processOutput._links.content.href;
+          return this.authService.getShortlivedToken().pipe(take(1),
+            map((token: string) => {
+              return hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url;
+            }));
+        })
+      )
+    });
+    this.outputLogs$ = this.outputLogFileUrl$.pipe(take(1),
+      mergeMap((url: string) => {
+        return this.getTextFile(url);
+      }),
+      finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false))),
+    );
+    this.outputLogs$.pipe(take(1)).subscribe();
+  }
+
+  getTextFile(filename: string): Observable<string> {
+    // The Observable returned by get() is of type Observable<string>
+    // because a text response was specified.
+    // There's no need to pass a <string> type parameter to get().
+    return this.http.get(filename, { responseType: 'text' })
+      .pipe(
+        finalize(() => {
+          this.showOutputLogs = true;
+        }),
+      );
+  }
+
+  /**
+   * Whether or not the given process has Completed or Failed status
+   * @param process Process to check if completed or failed
+   */
+  isProcessFinished(process: Process): boolean {
+    return (hasValue(process) && hasValue(process.processStatus) &&
+      (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()
+        || process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()));
+  }
+
+}
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
new file mode 100644
index 00000000000..ce6d62efec3
--- /dev/null
+++ b/src/app/process-page/form/process-form.component.html
@@ -0,0 +1,25 @@
+<div class="container">
+    <div class="row">
+        <h2 class="col-12">
+            {{headerKey | translate}}
+        </h2>
+        <div class="col-12 col-md-6">
+            <form #form="ngForm" (ngSubmit)="submitForm(form)">
+                <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
+                <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
+                <button [routerLink]="['/processes']" class="btn btn-light float-left">{{ 'process.new.cancel' | translate }}</button>
+                <button type="submit" class="btn btn-light float-right">{{ 'process.new.submit' | translate }}</button>
+            </form>
+        </div>
+        <div class="col-12 col-md-6">
+            <ds-script-help [script]="selectedScript"></ds-script-help>
+        </div>
+    </div>
+
+    <div *ngIf="missingParameters.length > 0" class="mt-3 alert alert-danger validation-error">
+        {{'process.new.parameter.required.missing' | translate}}
+        <ul>
+            <li *ngFor="let missing of missingParameters">{{missing}}</li>
+        </ul>
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-form.component.scss b/src/app/process-page/form/process-form.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/process-form.component.spec.ts b/src/app/process-page/form/process-form.component.spec.ts
new file mode 100644
index 00000000000..0afdf782014
--- /dev/null
+++ b/src/app/process-page/form/process-form.component.spec.ts
@@ -0,0 +1,90 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ProcessFormComponent } from './process-form.component';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { RequestService } from '../../core/data/request.service';
+import { Router } from '@angular/router';
+
+describe('ProcessFormComponent', () => {
+  let component: ProcessFormComponent;
+  let fixture: ComponentFixture<ProcessFormComponent>;
+  let scriptService;
+  let router;
+  let parameterValues;
+  let script;
+
+  function init() {
+    const param1 = new ScriptParameter();
+    const param2 = new ScriptParameter();
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+    parameterValues = [
+      Object.assign(new ProcessParameter(), { name: '-a', value: 'bla' }),
+      Object.assign(new ProcessParameter(), { name: '-b', value: '123' }),
+      Object.assign(new ProcessParameter(), { name: '-c', value: 'value' }),
+    ];
+    scriptService = jasmine.createSpyObj(
+      'scriptService',
+      {
+        invoke: observableOf({
+          response:
+            {
+              isSuccessful: true
+            }
+        })
+      }
+    );
+    router = {
+      navigateByUrl: () => undefined,
+    };
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ProcessFormComponent],
+      providers: [
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeBySubstring', 'removeByHrefSubstring']) },
+        { provide: Router, useValue: jasmine.createSpyObj('router', ['navigateByUrl']) },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessFormComponent);
+    component = fixture.componentInstance;
+    component.parameters = parameterValues;
+    component.selectedScript = script;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should call invoke on the scriptService on submit', () => {
+    component.submitForm({ controls: {} } as any);
+    expect(scriptService.invoke).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts
new file mode 100644
index 00000000000..c4f3bff6a60
--- /dev/null
+++ b/src/app/process-page/form/process-form.component.ts
@@ -0,0 +1,152 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Script } from '../scripts/script.model';
+import { Process } from '../processes/process.model';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { RequestService } from '../../core/data/request.service';
+import { Router } from '@angular/router';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { RemoteData } from '../../core/data/remote-data';
+import { getProcessListRoute } from '../process-page-routing.paths';
+
+/**
+ * Component to create a new script
+ */
+@Component({
+  selector: 'ds-process-form',
+  templateUrl: './process-form.component.html',
+  styleUrls: ['./process-form.component.scss'],
+})
+export class ProcessFormComponent implements OnInit {
+  /**
+   * The currently selected script
+   */
+  @Input() public selectedScript: Script = undefined;
+
+  /**
+   * The process to create
+   */
+  @Input() public process: Process = undefined;
+
+  /**
+   * The parameter values to use to start the process
+   */
+  @Input() public parameters: ProcessParameter[];
+
+  /**
+   * Optional files that are used as parameter values
+   */
+  public files: File[] = [];
+
+  /**
+   * Message key for the header of the form
+   */
+  @Input() public headerKey: string;
+
+  /**
+   * Contains the missing parameters on submission
+   */
+  public missingParameters = [];
+
+  constructor(
+    private scriptService: ScriptDataService,
+    private notificationsService: NotificationsService,
+    private translationService: TranslateService,
+    private requestService: RequestService,
+    private router: Router) {
+  }
+
+  ngOnInit(): void {
+    this.process = new Process();
+  }
+
+  /**
+   * Validates the form, sets the parameters to correct values and invokes the script with the correct parameters
+   * @param form
+   */
+  submitForm(form: NgForm) {
+    if (!this.validateForm(form) || this.isRequiredMissing()) {
+      return;
+    }
+
+    const stringParameters: ProcessParameter[] = this.parameters.map((parameter: ProcessParameter) => {
+        return {
+          name: parameter.name,
+          value: this.checkValue(parameter)
+        };
+      }
+    );
+    this.scriptService.invoke(this.selectedScript.id, stringParameters, this.files)
+      .pipe(getFirstCompletedRemoteData())
+      .subscribe((rd: RemoteData<Process>) => {
+        if (rd.hasSucceeded) {
+          const title = this.translationService.get('process.new.notification.success.title');
+          const content = this.translationService.get('process.new.notification.success.content');
+          this.notificationsService.success(title, content);
+          this.sendBack();
+        } else {
+          const title = this.translationService.get('process.new.notification.error.title');
+          const content = this.translationService.get('process.new.notification.error.content');
+          this.notificationsService.error(title, content);
+        }
+      })
+  }
+
+  /**
+   * Checks whether the parameter values are files
+   * Replaces file parameters by strings and stores the files in a separate list
+   * @param processParameter The parameter value to check
+   */
+  private checkValue(processParameter: ProcessParameter): string {
+    if (typeof processParameter.value === 'object') {
+      this.files = [...this.files, processParameter.value];
+      return processParameter.value.name;
+    }
+    return processParameter.value;
+  }
+
+  /**
+   * Validates the form
+   * Returns false if the form is invalid
+   * Returns true if the form is valid
+   * @param form The NgForm object to validate
+   */
+  private validateForm(form: NgForm) {
+    let valid = true;
+    Object.keys(form.controls).forEach((key) => {
+      if (form.controls[key].invalid) {
+        form.controls[key].markAsDirty();
+        valid = false;
+      }
+    });
+    return valid;
+  }
+
+  private isRequiredMissing() {
+    this.missingParameters = [];
+    const setParams: string[] = this.parameters
+      .map((param) => param.name);
+    const requiredParams: ScriptParameter[] = this.selectedScript.parameters.filter((param) => param.mandatory);
+    for (const rp of requiredParams) {
+      if (!setParams.includes(rp.name)) {
+        this.missingParameters.push(rp.name);
+      }
+    }
+    return this.missingParameters.length > 0;
+  }
+
+  private sendBack() {
+    this.requestService.removeByHrefSubstring('/processes');
+    /* should subscribe on the previous method to know the action is finished and then navigate,
+    will fix this when the removeByHrefSubstring changes are merged */
+    this.router.navigateByUrl(getProcessListRoute());
+  }
+}
+
+export function controlContainerFactory(controlContainer?: ControlContainer) {
+  return controlContainer;
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
new file mode 100644
index 00000000000..4bf06bbadec
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -0,0 +1,16 @@
+<div class="form-row mb-2 mx-0">
+    <select id="process-parameters"
+            class="form-control col"
+            name="parameter-{{index}}"
+            [(ngModel)]="selectedParameter"
+            #param="ngModel">
+        <option [ngValue]="undefined">Add a parameter...</option>
+        <option *ngFor="let param of parameters" [ngValue]="param.name">
+            {{param.nameLong || param.name}}
+        </option>
+    </select>
+    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col" [index]="index"></ds-parameter-value-input>
+    <button *ngIf="removable" class="btn btn-light col-1 remove-button" (click)="removeParameter.emit(parameterValue);"><span class="fas fa-trash"></span></button>
+    <span *ngIf="!removable" class="col-1"></span>
+</div>
+
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.scss b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
new file mode 100644
index 00000000000..97c0d7c3d01
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
@@ -0,0 +1,71 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ParameterSelectComponent } from './parameter-select.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { By } from '@angular/platform-browser';
+
+describe('ParameterSelectComponent', () => {
+  let component: ParameterSelectComponent;
+  let fixture: ComponentFixture<ParameterSelectComponent>;
+  let scriptParams: ScriptParameter[];
+
+  function init() {
+    scriptParams = [
+      Object.assign(
+        new ScriptParameter(),
+        {
+          name: '-a',
+          type: ScriptParameterType.BOOLEAN
+        }
+      ),
+      Object.assign(
+        new ScriptParameter(),
+        {
+          name: '-f',
+          type: ScriptParameterType.FILE
+        }
+      ),
+    ]
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [FormsModule],
+      declarations: [ParameterSelectComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ParameterSelectComponent);
+    component = fixture.componentInstance;
+
+    component.parameters = scriptParams;
+    component.removable = false;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show the remove button when removable', () => {
+    component.removable = true;
+    fixture.detectChanges();
+
+    const button = fixture.debugElement.query(By.css('button.remove-button'));
+    expect(button).not.toBeNull();
+  });
+
+  it('should hide the remove button when not removable', () => {
+    component.removable = false;
+    fixture.detectChanges();
+
+    const button = fixture.debugElement.query(By.css('button.remove-button'));
+    expect(button).toBeNull();
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
new file mode 100644
index 00000000000..e016d3442fc
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
@@ -0,0 +1,89 @@
+import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
+import { ProcessParameter } from '../../../processes/process-parameter.model';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../process-form.component';
+
+/**
+ * Component to select a single parameter for a process
+ */
+@Component({
+  selector: 'ds-parameter-select',
+  templateUrl: './parameter-select.component.html',
+  styleUrls: ['./parameter-select.component.scss'],
+  viewProviders: [{
+    provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]]
+  }]
+})
+export class ParameterSelectComponent {
+  @Input() index: number;
+
+  /**
+   * The current parameter value of the selected parameter
+   */
+  @Input() parameterValue: ProcessParameter = new ProcessParameter();
+
+  /**
+   * The available script parameters for the script
+   */
+  @Input() parameters: ScriptParameter[];
+
+  /**
+   * Whether or not this selected parameter can be removed from the list
+   */
+  @Input() removable: boolean;
+
+  /**
+   * Emits the parameter value when it's removed
+   */
+  @Output() removeParameter: EventEmitter<ProcessParameter> = new EventEmitter<ProcessParameter>();
+
+  /**
+   * Emits the updated parameter value when it changes
+   */
+  @Output() changeParameter: EventEmitter<ProcessParameter> = new EventEmitter<ProcessParameter>();
+
+  /**
+   * Returns the script parameter based on the currently selected name
+   */
+  get selectedScriptParameter(): ScriptParameter {
+    return this.parameters.find((parameter: ScriptParameter) => parameter.name === this.selectedParameter);
+  }
+
+  /**
+   * Return the currently selected parameter name
+   */
+  get selectedParameter(): string {
+    return this.parameterValue ? this.parameterValue.name : undefined;
+  }
+
+  /**
+   * Sets the currently selected parameter based on the provided parameter name
+   * Emits the new value from the changeParameter output
+   * @param value The parameter name to set
+   */
+  set selectedParameter(value: string) {
+    this.parameterValue.name = value;
+    this.selectedParameterValue = undefined;
+    this.changeParameter.emit(this.parameterValue);
+  }
+
+  /**
+   * Returns the currently selected parameter value
+   */
+  get selectedParameterValue(): any {
+    return this.parameterValue ? this.parameterValue.value : undefined;
+  }
+
+  /**
+   * Sets the currently selected value for the parameter
+   * Emits the new value from the changeParameter output
+   * @param value The parameter value to set
+   */
+  set selectedParameterValue(value: any) {
+    this.parameterValue.value = value;
+    this.changeParameter.emit(this.parameterValue);
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
new file mode 100644
index 00000000000..914b331413b
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
@@ -0,0 +1 @@
+<input type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
new file mode 100644
index 00000000000..15f09d98f06
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
@@ -0,0 +1,32 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BooleanValueInputComponent } from './boolean-value-input.component';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+describe('BooleanValueInputComponent', () => {
+  let component: BooleanValueInputComponent;
+  let fixture: ComponentFixture<BooleanValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BooleanValueInputComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BooleanValueInputComponent);
+    component = fixture.componentInstance;
+    spyOn(component.updateValue, 'emit');
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should emit true onInit', () => {
+    expect(component.updateValue.emit).toHaveBeenCalledWith(true);
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
new file mode 100644
index 00000000000..51b93cb6a10
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit, Optional } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the value of a boolean parameter
+ */
+@Component({
+  selector: 'ds-boolean-value-input',
+  templateUrl: './boolean-value-input.component.html',
+  styleUrls: ['./boolean-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class BooleanValueInputComponent extends ValueInputComponent<boolean> implements OnInit {
+  ngOnInit() {
+    this.updateValue.emit(true)
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
new file mode 100644
index 00000000000..f367d3779f2
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
@@ -0,0 +1,7 @@
+<input required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<div *ngIf="string.invalid && (string.dirty || string.touched)"
+     class="alert alert-danger validation-error">
+    <div *ngIf="string.errors.required">
+        {{'process.new.parameter.string.required' | translate}}
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
new file mode 100644
index 00000000000..4f2212eff63
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
@@ -0,0 +1,70 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { DateValueInputComponent } from './date-value-input.component';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+
+describe('DateValueInputComponent', () => {
+  let component: DateValueInputComponent;
+  let fixture: ComponentFixture<DateValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [DateValueInputComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DateValueInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty',  fakeAsync(() => {
+    component.value = '';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  }));
+
+  it('should not show a validation error if the input field was touched but not left empty', fakeAsync(() => {
+    component.value = 'testValue';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  }));
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
new file mode 100644
index 00000000000..7a4fbc09653
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -0,0 +1,36 @@
+import { Component, Input, Optional } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the user inputted value of a date parameter
+ */
+@Component({
+  selector: 'ds-date-value-input',
+  templateUrl: './date-value-input.component.html',
+  styleUrls: ['./date-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class DateValueInputComponent extends ValueInputComponent<string> {
+  /**
+   * The current value of the date string
+   */
+  value: string;
+
+  /**
+   * Initial value of the field
+   */
+  @Input() initialValue;
+
+  ngOnInit() {
+    this.value = this.initialValue;
+  }
+
+  setValue(value) {
+    this.value = value;
+    this.updateValue.emit(value)
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
new file mode 100644
index 00000000000..cac3fbd82d5
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -0,0 +1,13 @@
+<label for="file-upload-{{index}}" class="d-flex align-items-center m-0">
+    <span class="btn btn-light">
+        {{'process.new.parameter.file.upload-button' | translate}}
+    </span>
+    <span class="file-name ml-1">{{fileObject?.name}}</span>
+</label>
+<input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control-file d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
+<div *ngIf="file.invalid && (file.dirty || file.touched)"
+     class="alert alert-danger validation-error">
+    <div *ngIf="file.errors.required">
+        {{'process.new.parameter.file.required' | translate}}
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.scss
new file mode 100644
index 00000000000..29ea31add0e
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.scss
@@ -0,0 +1,6 @@
+.file-name {
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
new file mode 100644
index 00000000000..434d5e4edb7
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
@@ -0,0 +1,57 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { FormsModule, NgForm, ReactiveFormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { FileValueInputComponent } from './file-value-input.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { FileValueAccessorDirective } from '../../../../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../../../../shared/utils/require-file.validator';
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+
+describe('FileValueInputComponent', () => {
+  let component: FileValueInputComponent;
+  let fixture: ComponentFixture<FileValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [FileValueInputComponent, FileValueAccessorDirective, FileValidator],
+      schemas: [NO_ERRORS_SCHEMA]
+
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FileValueInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty',  () => {
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
new file mode 100644
index 00000000000..796a5de58e0
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
@@ -0,0 +1,26 @@
+import { Component, Optional } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the user inputted value of a file parameter
+ */
+@Component({
+  selector: 'ds-file-value-input',
+  templateUrl: './file-value-input.component.html',
+  styleUrls: ['./file-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class FileValueInputComponent extends ValueInputComponent<File> {
+  /**
+   * The current value of the file
+   */
+  fileObject: File;
+  setFile(files) {
+    this.fileObject = files.length > 0 ? files[0] : undefined;
+    this.updateValue.emit(this.fileObject);
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
new file mode 100644
index 00000000000..57bd4ee7e59
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
@@ -0,0 +1,7 @@
+<div [ngSwitch]="parameter?.type">
+  <ds-string-value-input *ngSwitchCase="parameterTypes.STRING" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+  <ds-string-value-input *ngSwitchCase="parameterTypes.OUTPUT" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+  <ds-date-value-input *ngSwitchCase="parameterTypes.DATE" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-date-value-input>
+  <ds-file-value-input *ngSwitchCase="parameterTypes.FILE" (updateValue)="updateValue.emit($event)" [index]="index"></ds-file-value-input>
+  <ds-boolean-value-input *ngSwitchCase="parameterTypes.BOOLEAN" (updateValue)="updateValue.emit($event)" [index]="index"></ds-boolean-value-input>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
new file mode 100644
index 00000000000..4a89c4924dc
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
@@ -0,0 +1,105 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ParameterValueInputComponent } from './parameter-value-input.component';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { By } from '@angular/platform-browser';
+import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
+import { StringValueInputComponent } from './string-value-input/string-value-input.component';
+import { FileValueInputComponent } from './file-value-input/file-value-input.component';
+import { DateValueInputComponent } from './date-value-input/date-value-input.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { FileValueAccessorDirective } from '../../../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../../../shared/utils/require-file.validator';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+
+describe('ParameterValueInputComponent', () => {
+  let component: ParameterValueInputComponent;
+  let fixture: ComponentFixture<ParameterValueInputComponent>;
+  let booleanParameter;
+  let stringParameter;
+  let fileParameter;
+  let dateParameter;
+  let outputParameter;
+
+  function init() {
+    booleanParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.BOOLEAN });
+    stringParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.STRING });
+    fileParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.FILE });
+    dateParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.DATE });
+    outputParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.OUTPUT });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [
+        ParameterValueInputComponent,
+        BooleanValueInputComponent,
+        StringValueInputComponent,
+        FileValueInputComponent,
+        DateValueInputComponent,
+        FileValueAccessorDirective,
+        FileValidator
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ParameterValueInputComponent);
+    component = fixture.componentInstance;
+    component.parameter = stringParameter;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show a BooleanValueInputComponent when the parameter type is boolean', () => {
+    component.parameter = booleanParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(BooleanValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a StringValueInputComponent when the parameter type is string', () => {
+    component.parameter = stringParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(StringValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a FileValueInputComponent when the parameter type is file', () => {
+    component.parameter = fileParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(FileValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a DateValueInputComponent when the parameter type is date', () => {
+    component.parameter = dateParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(DateValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a StringValueInputComponent when the parameter type is output', () => {
+    component.parameter = outputParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(StringValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
new file mode 100644
index 00000000000..ec29ee5e1e8
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
@@ -0,0 +1,39 @@
+import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../process-form.component';
+
+/**
+ * Component that renders the correct parameter value input based the script parameter's type
+ */
+@Component({
+  selector: 'ds-parameter-value-input',
+  templateUrl: './parameter-value-input.component.html',
+  styleUrls: ['./parameter-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class ParameterValueInputComponent {
+  @Input() index: number;
+
+  /**
+   * The current script parameter
+   */
+  @Input() parameter: ScriptParameter;
+
+  /**
+   * Initial value for input
+   */
+  @Input() initialValue: any;
+  /**
+   * Emits the value of the input when its updated
+   */
+  @Output() updateValue: EventEmitter<any> = new EventEmitter();
+
+  /**
+   * The available script parameter types
+   */
+  parameterTypes = ScriptParameterType;
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
new file mode 100644
index 00000000000..246c62a0f61
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
@@ -0,0 +1,7 @@
+<input required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<div *ngIf="string.invalid && (string.dirty || string.touched)"
+     class="alert alert-danger validation-error">
+    <div *ngIf="string.errors.required">
+        {{'process.new.parameter.string.required' | translate}}
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
new file mode 100644
index 00000000000..e702746adc1
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
@@ -0,0 +1,72 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { FormsModule, NgForm } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { StringValueInputComponent } from './string-value-input.component';
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+
+describe('StringValueInputComponent', () => {
+  let component: StringValueInputComponent;
+  let fixture: ComponentFixture<StringValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [StringValueInputComponent],
+      providers: [
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StringValueInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty', fakeAsync(() => {
+    component.value = '';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  }));
+
+  it('should not show a validation error if the input field was touched but not left empty', fakeAsync(() => {
+    component.value = 'testValue';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  }));
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
new file mode 100644
index 00000000000..0e556694326
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -0,0 +1,36 @@
+import { Component, Optional, Input } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the user inputted value of a string parameter
+ */
+@Component({
+  selector: 'ds-string-value-input',
+  templateUrl: './string-value-input.component.html',
+  styleUrls: ['./string-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class StringValueInputComponent extends ValueInputComponent<string> {
+  /**
+   * The current value of the string
+   */
+  value: string;
+
+  /**
+   * Initial value of the field
+   */
+  @Input() initialValue;
+
+  ngOnInit() {
+    this.value = this.initialValue;
+  }
+
+  setValue(value) {
+    this.value = value;
+    this.updateValue.emit(value)
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
new file mode 100644
index 00000000000..9e9a091dcd6
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
@@ -0,0 +1,12 @@
+import { EventEmitter, Input, Output } from '@angular/core';
+
+/**
+ * Abstract class that represents value input components
+ */
+export abstract class ValueInputComponent<T> {
+  @Input() index: number;
+  /**
+   * Used by the subclasses to emit the value when it's updated
+   */
+  @Output() updateValue: EventEmitter<T> = new EventEmitter<T>()
+}
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.html b/src/app/process-page/form/process-parameters/process-parameters.component.html
new file mode 100644
index 00000000000..d7bbce67796
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.html
@@ -0,0 +1,11 @@
+<div class="form-group" *ngIf="script">
+    <label>{{'process.new.select-parameters' | translate}}</label>
+    <ds-parameter-select
+            *ngFor="let value of parameterValues; let i = index; let last = last"
+            [parameters]="script.parameters"
+            [parameterValue]="value"
+            [removable]="!last"
+            [index]="i"
+            (removeParameter)="removeParameter(i)"
+            (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
+</div>
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.scss b/src/app/process-page/form/process-parameters/process-parameters.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
new file mode 100644
index 00000000000..3fc94d92a1b
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
@@ -0,0 +1,64 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProcessParametersComponent } from './process-parameters.component';
+import { ProcessParameter } from '../../processes/process-parameter.model';
+import { By } from '@angular/platform-browser';
+import { ParameterSelectComponent } from './parameter-select/parameter-select.component';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+
+describe('ProcessParametersComponent', () => {
+  let component: ProcessParametersComponent;
+  let fixture: ComponentFixture<ProcessParametersComponent>;
+  let parameterValues;
+  let script;
+
+  function init() {
+    const param1 = new ScriptParameter();
+    const param2 = new ScriptParameter();
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+    parameterValues = [
+      Object.assign(new ProcessParameter(), { name: '-a', value: 'bla' }),
+      Object.assign(new ProcessParameter(), { name: '-b', value: '123' }),
+      Object.assign(new ProcessParameter(), { name: '-c', value: 'value' }),
+    ]
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ProcessParametersComponent, ParameterSelectComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessParametersComponent);
+    component = fixture.componentInstance;
+    component.script = script;
+    component.parameterValues = parameterValues;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render a ParameterSelectComponent for each parameter value of the component', () => {
+    const selectComponents = fixture.debugElement.queryAll(By.directive(ParameterSelectComponent));
+    expect(selectComponents.length).toBe(parameterValues.length);
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
new file mode 100644
index 00000000000..de55f9ebca2
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -0,0 +1,114 @@
+import { Component, EventEmitter, Input, OnChanges, Optional, Output, SimpleChanges } from '@angular/core';
+import { Script } from '../../scripts/script.model';
+import { ProcessParameter } from '../../processes/process-parameter.model';
+import { hasValue } from '../../../shared/empty.util';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { controlContainerFactory } from '../process-form.component';
+
+/**
+ * Component that represents the selected list of parameters for a script
+ */
+@Component({
+  selector: 'ds-process-parameters',
+  templateUrl: './process-parameters.component.html',
+  styleUrls: ['./process-parameters.component.scss'],
+  viewProviders: [{
+    provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]]
+  }]
+})
+export class ProcessParametersComponent implements OnChanges {
+  /**
+   * The currently selected script
+   */
+  @Input() script: Script;
+
+  /**
+   * Initial parameters on load
+   */
+  @Input() initialParams: ProcessParameter[];
+  /**
+   * Emits the parameter values when they're updated
+   */
+  @Output() updateParameters: EventEmitter<ProcessParameter[]> = new EventEmitter();
+
+  /**
+   * The current parameter values
+   */
+  parameterValues: ProcessParameter[];
+
+  ngOnInit() {
+    if (hasValue(this.initialParams)) {
+      this.parameterValues = this.initialParams;
+    }
+  }
+
+  /**
+   * Makes sure the parameters are reset when the script changes
+   * @param changes
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.script) {
+      this.initParameters()
+    }
+  }
+
+  /**
+   * Empties the parameter values
+   * Initializes the first parameter value
+   */
+  initParameters() {
+    if (hasValue(this.initialParams)) {
+      this.parameterValues = this.initialParams;
+    } else {
+      this.parameterValues = [];
+      this.initializeParameter();
+    }
+  }
+
+  /**
+   * Updates a single parameter value using its new value and index
+   * Adds a new parameter when the last of the parameter values is changed
+   * @param processParameter The new value of the parameter
+   * @param index The index of the parameter
+   */
+  updateParameter(processParameter: ProcessParameter, index: number) {
+    this.parameterValues[index] = processParameter;
+    if (index === this.parameterValues.length - 1) {
+      this.addParameter();
+    }
+    this.updateParameters.emit(this.parameterValues.filter((param: ProcessParameter) => hasValue(param.name)));
+  }
+
+  /**
+   * Removes a parameter value from the list
+   * @param index The index of the parameter to remove
+   */
+  removeParameter(index: number) {
+    this.parameterValues = this.parameterValues.filter((value, i) => i !== index);
+    this.updateParameters.emit(this.parameterValues.filter((param: ProcessParameter) => hasValue(param.name)));
+  }
+
+  /**
+   * Initializes parameter values based on the selected script
+   */
+  initializeParameter() {
+    if (hasValue(this.script)) {
+      this.parameterValues = this.script.parameters
+        .filter((param) => param.mandatory)
+        .map(
+          (parameter: ScriptParameter) => Object.assign(new ProcessParameter(), { name: parameter.name })
+        );
+    }
+    this.addParameter();
+  }
+
+  /**
+   * Adds an empty parameter value to the end of the list
+   */
+  addParameter() {
+    this.parameterValues = [...this.parameterValues, new ProcessParameter()];
+  }
+}
diff --git a/src/app/process-page/form/script-help/script-help.component.html b/src/app/process-page/form/script-help/script-help.component.html
new file mode 100644
index 00000000000..f52ae4b6b99
--- /dev/null
+++ b/src/app/process-page/form/script-help/script-help.component.html
@@ -0,0 +1,22 @@
+<div class="text-secondary">
+  <h3>{{script?.name}}</h3>
+  <span>{{script?.description}}</span>
+
+  <table class="table-borderless mt-3">
+    <tr *ngFor="let param of script?.parameters">
+      <td class="align-top text-nowrap">{{param.name}} {{param.nameLong}}
+        <ng-container *ngTemplateOutlet="type; context: param"></ng-container>
+      </td>
+      <td>{{param.description}}</td>
+    </tr>
+  </table>
+</div>
+
+<ng-template #type let-type="type">
+    <ng-container [ngSwitch]="type">
+        <span *ngSwitchCase="parameterTypes.DATE"><{{'process.new.parameter.type.value' | translate}}></span>
+        <span *ngSwitchCase="parameterTypes.STRING"><{{'process.new.parameter.type.value' | translate}}></span>
+        <span *ngSwitchCase="parameterTypes.OUTPUT"><{{'process.new.parameter.type.value' | translate}}></span>
+        <span *ngSwitchCase="parameterTypes.FILE"><{{'process.new.parameter.type.file' | translate}}></span>
+    </ng-container>
+</ng-template>
diff --git a/src/app/process-page/form/script-help/script-help.component.scss b/src/app/process-page/form/script-help/script-help.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/script-help/script-help.component.spec.ts b/src/app/process-page/form/script-help/script-help.component.spec.ts
new file mode 100644
index 00000000000..4e4aa48276b
--- /dev/null
+++ b/src/app/process-page/form/script-help/script-help.component.spec.ts
@@ -0,0 +1,65 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ScriptHelpComponent } from './script-help.component';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
+import { By } from '@angular/platform-browser';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+
+describe('ScriptHelpComponent', () => {
+  let component: ScriptHelpComponent;
+  let fixture: ComponentFixture<ScriptHelpComponent>;
+  let script;
+
+  function init() {
+    const param1 = Object.assign(
+      new ScriptParameter(),
+      {name: '-d', description: 'Lorem ipsum dolor sit amet,', type: ScriptParameterType.DATE}
+    );
+    const param2 = Object.assign(
+      new ScriptParameter(),
+      {name: '-f', description: 'consetetur sadipscing elitr', type: ScriptParameterType.BOOLEAN}
+    );
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ ScriptHelpComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ScriptHelpComponent);
+    component = fixture.componentInstance;
+    component.script = script;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show the name and description for each parameter of the script', () => {
+    const rows = fixture.debugElement.queryAll(By.css('tr'));
+    expect(rows.length).toBe(script.parameters.length);
+    script.parameters.forEach((parameter, index) => {
+      expect(rows[index].queryAll(By.css('td'))[0].nativeElement.textContent).toContain(parameter.name);
+      expect(rows[index].queryAll(By.css('td'))[1].nativeElement.textContent.trim()).toEqual(parameter.description);
+    })
+  });
+});
diff --git a/src/app/process-page/form/script-help/script-help.component.ts b/src/app/process-page/form/script-help/script-help.component.ts
new file mode 100644
index 00000000000..7e230a4a425
--- /dev/null
+++ b/src/app/process-page/form/script-help/script-help.component.ts
@@ -0,0 +1,23 @@
+import { Component, Input } from '@angular/core';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
+
+/**
+ * Components that represents a help section for the script use and parameters
+ */
+@Component({
+  selector: 'ds-script-help',
+  templateUrl: './script-help.component.html',
+  styleUrls: ['./script-help.component.scss']
+})
+export class ScriptHelpComponent {
+  /**
+   * The current script to show the help information for
+   */
+  @Input() script: Script;
+
+  /**
+   * The available script parameter types
+   */
+  parameterTypes = ScriptParameterType;
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
new file mode 100644
index 00000000000..9cd86d1a6d0
--- /dev/null
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -0,0 +1,20 @@
+<div class="form-group" *ngIf="scripts$ | async">
+    <label for="process-script">{{'process.new.select-script' | translate}}</label>
+    <select required id="process-script"
+            class="form-control"
+            name="script"
+            [(ngModel)]="selectedScript"
+            #script="ngModel">
+        <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option>
+        <option *ngFor="let script of scripts$ | async" [ngValue]="script.id">
+            {{script.name}}
+        </option>
+    </select>
+
+    <div *ngIf="script.invalid && (script.dirty || script.touched)"
+         class="alert alert-danger validation-error">
+        <div *ngIf="script.errors.required">
+            {{'process.new.select-script.required' | translate}}
+        </div>
+    </div>
+</div>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.scss b/src/app/process-page/form/scripts-select/scripts-select.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
new file mode 100644
index 00000000000..627ab1ae6b6
--- /dev/null
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -0,0 +1,99 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { ScriptsSelectComponent } from './scripts-select.component';
+import { Script } from '../../scripts/script.model';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+
+describe('ScriptsSelectComponent', () => {
+  let component: ScriptsSelectComponent;
+  let fixture: ComponentFixture<ScriptsSelectComponent>;
+  let scriptService;
+  let script1;
+  let script2;
+
+  function init() {
+    script1 = new Script();
+    script2 = new Script();
+    scriptService = jasmine.createSpyObj('scriptService',
+      {
+        findAll: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [script1, script2]))
+      }
+    )
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ScriptsSelectComponent],
+      providers: [
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: Router, useClass: RouterStub },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ScriptsSelectComponent);
+    component = fixture.componentInstance;
+    (component as any)._selectedScript = new Script();
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty', fakeAsync(() => {
+    (component as any)._selectedScript.id = '';
+    fixture.detectChanges();
+    tick();
+
+    const select = fixture.debugElement.query(By.css('select'));
+    select.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  }));
+
+  it('should not show a validation error if the input field was touched but not left empty', fakeAsync(() => {
+    (component as any)._selectedScript.id = 'testValue';
+    fixture.detectChanges();
+    tick();
+
+    const select = fixture.debugElement.query(By.css('select'));
+    select.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  }));
+});
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
new file mode 100644
index 00000000000..be84e464775
--- /dev/null
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -0,0 +1,106 @@
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Optional, Output } from '@angular/core';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import { Script } from '../../scripts/script.model';
+import { Observable, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { ActivatedRoute, Params, Router } from '@angular/router';
+import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../process-form.component';
+
+const SCRIPT_QUERY_PARAMETER = 'script';
+
+/**
+ * Component used to select a script
+ */
+@Component({
+  selector: 'ds-scripts-select',
+  templateUrl: './scripts-select.component.html',
+  styleUrls: ['./scripts-select.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class ScriptsSelectComponent implements OnInit, OnDestroy {
+  /**
+   * Emits the selected script when the selection changes
+   */
+  @Output() select: EventEmitter<Script> = new EventEmitter<Script>();
+  /**
+   * All available scripts
+   */
+  scripts$: Observable<Script[]>;
+  private _selectedScript: Script;
+  private routeSub: Subscription;
+
+  constructor(
+    private scriptService: ScriptDataService,
+    private router: Router,
+    private route: ActivatedRoute,
+  ) {
+  }
+
+  /**
+   * Sets all available scripts
+   * Checks if the route contains a script ID and auto selects this scripts
+   */
+  ngOnInit() {
+    this.scripts$ = this.scriptService.findAll({ elementsPerPage: Number.MAX_SAFE_INTEGER })
+      .pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        map((paginatedList: PaginatedList<Script>) => paginatedList.page)
+      );
+
+    this.routeSub = this.route.queryParams
+      .pipe(
+        filter((params: Params) => hasNoValue(params.id)),
+        map((params: Params) => params[SCRIPT_QUERY_PARAMETER]),
+        distinctUntilChanged(),
+        switchMap((id: string) =>
+          this.scripts$
+            .pipe(
+              take(1),
+              map((scripts) =>
+                scripts.find((script) => script.id === id)
+              )
+            )
+        )
+      ).subscribe((script: Script) => {
+        this._selectedScript = script;
+        this.select.emit(script);
+      });
+  }
+
+  /**
+   * Returns the identifier of the selected script
+   */
+  get selectedScript(): string {
+    return this._selectedScript ? this._selectedScript.id : undefined;
+  }
+
+  /**
+   * Sets the currently selected script by navigating to the correct route using the scripts ID
+   * @param value The identifier of the script
+   */
+  set selectedScript(value: string) {
+    this.router.navigate([],
+      {
+        queryParams: { [SCRIPT_QUERY_PARAMETER]: value },
+      }
+    );
+  }
+
+  @Input()
+  set script(value: Script) {
+     this._selectedScript = value;
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.routeSub)) {
+      this.routeSub.unsubscribe();
+    }
+  }
+}
diff --git a/src/app/process-page/new/new-process.component.html b/src/app/process-page/new/new-process.component.html
new file mode 100644
index 00000000000..f61764ffd27
--- /dev/null
+++ b/src/app/process-page/new/new-process.component.html
@@ -0,0 +1,6 @@
+<ng-container *ngIf="fromExisting$ && (fromExisting$ | async)">
+    <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
+</ng-container>
+<ng-container *ngIf="!fromExisting$ || !(fromExisting$ | async)">
+    <ds-process-form headerKey="process.new.header"></ds-process-form>
+</ng-container>
diff --git a/src/app/process-page/new/new-process.component.scss b/src/app/process-page/new/new-process.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/process-page/new/new-process.component.spec.ts b/src/app/process-page/new/new-process.component.spec.ts
new file mode 100644
index 00000000000..bb3ad24ed3e
--- /dev/null
+++ b/src/app/process-page/new/new-process.component.spec.ts
@@ -0,0 +1,84 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NewProcessComponent } from './new-process.component';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { RequestService } from '../../core/data/request.service';
+import { ActivatedRoute } from '@angular/router';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+
+describe('NewProcessComponent', () => {
+  let component: NewProcessComponent;
+  let fixture: ComponentFixture<NewProcessComponent>;
+  let scriptService;
+  let parameterValues;
+  let script;
+
+  function init() {
+    const param1 = new ScriptParameter();
+    const param2 = new ScriptParameter();
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+    parameterValues = [
+      Object.assign(new ProcessParameter(), { name: '-a', value: 'bla' }),
+      Object.assign(new ProcessParameter(), { name: '-b', value: '123' }),
+      Object.assign(new ProcessParameter(), { name: '-c', value: 'value' }),
+    ];
+    scriptService = jasmine.createSpyObj(
+      'scriptService',
+      {
+        invoke: observableOf({
+          response:
+            {
+              isSuccessful: true
+            }
+        })
+      }
+    )
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [NewProcessComponent, VarDirective],
+      providers: [
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: RequestService, useValue: {} },
+        { provide: ActivatedRoute, useValue: { snapshot: { queryParams: {} } } },
+        { provide: LinkService, useValue: {} },
+        { provide: ProcessDataService, useValue: {} },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NewProcessComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts
new file mode 100644
index 00000000000..f97ce1bc6b2
--- /dev/null
+++ b/src/app/process-page/new/new-process.component.ts
@@ -0,0 +1,47 @@
+import { Component, OnInit } from '@angular/core';
+import { Process } from '../processes/process.model';
+import { ActivatedRoute } from '@angular/router';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { Script } from '../scripts/script.model';
+
+/**
+ * Component to create a new script
+ */
+@Component({
+  selector: 'ds-new-process',
+  templateUrl: './new-process.component.html',
+  styleUrls: ['./new-process.component.scss'],
+})
+export class NewProcessComponent implements OnInit {
+  /**
+   * Emits preselected process if there is one
+   */
+  fromExisting$?: Observable<Process>;
+  /**
+   * Emits preselected script if there is one
+   */
+  script$?: Observable<Script>;
+
+  constructor(private route: ActivatedRoute, private processService: ProcessDataService, private linkService: LinkService) {
+  }
+
+  /**
+   * If there's an id parameter, use this the process with this identifier as presets for the form
+   */
+  ngOnInit() {
+    const id = this.route.snapshot.queryParams.id;
+    if (id) {
+      this.fromExisting$ = this.processService.findById(id).pipe(getFirstSucceededRemoteDataPayload());
+      this.script$ = this.fromExisting$.pipe(
+        map((process: Process) => this.linkService.resolveLink<Process>(process, followLink('script'))),
+        switchMap((process: Process) => process.script),
+        getFirstSucceededRemoteDataPayload()
+      );
+    }
+  }
+}
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
new file mode 100644
index 00000000000..30eb44430ea
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -0,0 +1,38 @@
+<div class="container">
+    <div class="d-flex">
+        <h2 class="flex-grow-1">{{'process.overview.title' | translate}}</h2>
+        <button class="btn btn-lg btn-success " routerLink="/processes/new"><i class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
+    </div>
+    <ds-pagination *ngIf="(processesRD$ | async)?.payload?.totalElements > 0"
+                   [paginationOptions]="pageConfig"
+                   [pageInfoState]="(processesRD$ | async)?.payload"
+                   [collectionSize]="(processesRD$ | async)?.payload?.totalElements"
+                   [hideGear]="true"
+                   [hidePagerWhenSinglePage]="true"
+                   (pageChange)="onPageChange($event)">
+        <div class="table-responsive">
+            <table class="table table-striped table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">{{'process.overview.table.id' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.name' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.user' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.start' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.finish' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.status' | translate}}</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngFor="let process of (processesRD$ | async)?.payload?.page">
+                    <td><a [routerLink]="['/processes/', process.processId]">{{process.processId}}</a></td>
+                    <td><a [routerLink]="['/processes/', process.processId]">{{process.scriptName}}</a></td>
+                    <td *ngVar="(getEpersonName(process.userId) | async) as ePersonName">{{ePersonName}}</td>
+                    <td>{{process.startTime | date:dateFormat}}</td>
+                    <td>{{process.endTime | date:dateFormat}}</td>
+                    <td>{{process.processStatus}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </ds-pagination>
+</div>
diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts
new file mode 100644
index 00000000000..bbdd7d7a6cf
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.component.spec.ts
@@ -0,0 +1,158 @@
+import { ProcessOverviewComponent } from './process-overview.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { Process } from '../processes/process.model';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { By } from '@angular/platform-browser';
+import { ProcessStatus } from '../processes/process-status.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+
+describe('ProcessOverviewComponent', () => {
+  let component: ProcessOverviewComponent;
+  let fixture: ComponentFixture<ProcessOverviewComponent>;
+
+  let processService: ProcessDataService;
+  let ePersonService: EPersonDataService;
+
+  let processes: Process[];
+  let ePerson: EPerson;
+
+  function init() {
+    processes = [
+      Object.assign(new Process(), {
+        processId: 1,
+        scriptName: 'script-name',
+        startTime: '2020-03-19',
+        endTime: '2020-03-19',
+        processStatus: ProcessStatus.COMPLETED
+      }),
+      Object.assign(new Process(), {
+        processId: 2,
+        scriptName: 'script-name',
+        startTime: '2020-03-20',
+        endTime: '2020-03-20',
+        processStatus: ProcessStatus.FAILED
+      }),
+      Object.assign(new Process(), {
+        processId: 3,
+        scriptName: 'another-script-name',
+        startTime: '2020-03-21',
+        endTime: '2020-03-21',
+        processStatus: ProcessStatus.RUNNING
+      })
+    ];
+    ePerson = Object.assign(new EPerson(), {
+      metadata: {
+        'eperson.firstname': [
+          {
+            value: 'John',
+            language: null
+          }
+        ],
+        'eperson.lastname': [
+          {
+            value: 'Doe',
+            language: null
+          }
+        ]
+      }
+    });
+    processService = jasmine.createSpyObj('processService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(processes))
+    });
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      findById: createSuccessfulRemoteDataObject$(ePerson)
+    });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [ProcessOverviewComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: ProcessDataService, useValue: processService },
+        { provide: EPersonDataService, useValue: ePersonService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessOverviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('table structure', () => {
+    let rowElements;
+
+    beforeEach(() => {
+      rowElements = fixture.debugElement.queryAll(By.css('tbody tr'));
+    });
+
+    it(`should contain 3 rows`, () => {
+      expect(rowElements.length).toEqual(3);
+    });
+
+    it('should display the process IDs in the first column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(1)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].processId);
+      });
+    });
+
+    it('should display the script names in the second column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(2)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].scriptName);
+      });
+    });
+
+    it('should display the eperson\'s name in the third column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(3)')).nativeElement;
+        expect(el.textContent).toContain(ePerson.name);
+      });
+    });
+
+    it('should display the start time in the fourth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(4)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].startTime);
+      });
+    });
+
+    it('should display the end time in the fifth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(5)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].endTime);
+      });
+    });
+
+    it('should display the status in the sixth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(6)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].processStatus);
+      });
+    });
+  });
+
+  describe('onPageChange', () => {
+    const toPage = 2;
+
+    beforeEach(() => {
+      component.onPageChange(toPage);
+    });
+
+    it('should call a new findAll with the corresponding page', () => {
+      expect(processService.findAll).toHaveBeenCalledWith(jasmine.objectContaining({ currentPage: toPage }));
+    });
+  });
+});
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
new file mode 100644
index 00000000000..9ba238ca27d
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -0,0 +1,86 @@
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { Process } from '../processes/process.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { FindListOptions } from '../../core/data/request.models';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { map } from 'rxjs/operators';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+
+@Component({
+  selector: 'ds-process-overview',
+  templateUrl: './process-overview.component.html',
+})
+/**
+ * Component displaying a list of all processes in a paginated table
+ */
+export class ProcessOverviewComponent implements OnInit {
+
+  /**
+   * List of all processes
+   */
+  processesRD$: Observable<RemoteData<PaginatedList<Process>>>;
+
+  /**
+   * The current pagination configuration for the page used by the FindAll method
+   */
+  config: FindListOptions = Object.assign(new FindListOptions(), {
+    elementsPerPage: 20
+  });
+
+  /**
+   * The current pagination configuration for the page
+   */
+  pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'process-overview-pagination',
+    pageSize: 20
+  });
+
+  /**
+   * Date format to use for start and end time of processes
+   */
+  dateFormat = 'yyyy-MM-dd HH:mm:ss';
+
+  constructor(protected processService: ProcessDataService,
+              protected ePersonService: EPersonDataService) {
+  }
+
+  ngOnInit(): void {
+    this.setProcesses();
+  }
+
+  /**
+   * When the page is changed, make sure to update the list of processes to match the new page
+   * @param event The page change event
+   */
+  onPageChange(event) {
+    this.config = Object.assign(new FindListOptions(), this.config, {
+      currentPage: event,
+    });
+    this.pageConfig.currentPage = event;
+    this.setProcesses();
+  }
+
+  /**
+   * Send a request to fetch all processes for the current page
+   */
+  setProcesses() {
+    this.processesRD$ = this.processService.findAll(this.config);
+  }
+
+  /**
+   * Get the name of an EPerson by ID
+   * @param id  ID of the EPerson
+   */
+  getEpersonName(id: string): Observable<string> {
+    return this.ePersonService.findById(id).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((eperson: EPerson) => eperson.name)
+    );
+  }
+
+}
diff --git a/src/app/process-page/process-breadcrumb.resolver.spec.ts b/src/app/process-page/process-breadcrumb.resolver.spec.ts
new file mode 100644
index 00000000000..4c2e6b81582
--- /dev/null
+++ b/src/app/process-page/process-breadcrumb.resolver.spec.ts
@@ -0,0 +1,40 @@
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { Process } from './processes/process.model';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+
+describe('ProcessBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: ProcessBreadcrumbResolver;
+    let processDataService: ProcessDataService;
+    let processBreadcrumbService: any;
+    let process: Process;
+    let id: string;
+    let path: string;
+    beforeEach(() => {
+      id = '12345';
+      process = Object.assign(new Process(), { id });
+      path = 'rest.com/path/to/breadcrumb/12345';
+      processBreadcrumbService = {};
+      processDataService = {
+        findById: () => createSuccessfulRemoteDataObject$(process)
+      } as any;
+      resolver = new ProcessBreadcrumbResolver(processBreadcrumbService, processDataService);
+    });
+
+    it('should resolve the breadcrumb config', (done) => {
+      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: process }, params: { id: id} } as any, {url: path} as any);
+      const expectedConfig = { provider: processBreadcrumbService, key: process, url: path};
+      resolvedConfig.subscribe((config) => {
+        expect(config).toEqual(expectedConfig);
+        done();
+      })
+    });
+
+    it('should resolve throw an error when no breadcrumbKey is defined', () => {
+      expect(() => {
+        resolver.resolve({ data: {} } as any, undefined)
+      }).toThrow();
+    });
+  });
+});
diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts
new file mode 100644
index 00000000000..1c813155434
--- /dev/null
+++ b/src/app/process-page/process-breadcrumb.resolver.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { map } from 'rxjs/operators';
+import { Process } from './processes/process.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+
+/**
+ * This class represents a resolver that requests a specific process before the route is activated
+ */
+@Injectable()
+export class ProcessBreadcrumbResolver implements Resolve<BreadcrumbConfig<Process>> {
+  constructor(protected breadcrumbService: ProcessBreadcrumbsService, private processService: ProcessDataService) {
+  }
+
+  /**
+   * Method for resolving a process based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Process>> Emits the found process based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Process>> {
+    const id = route.params.id;
+
+    return this.processService.findById(route.params.id, false, followLink('script')).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((object: Process) => {
+        const fullPath = state.url;
+        const url = fullPath.substr(0, fullPath.indexOf(id)) + id;
+        return { provider: this.breadcrumbService, key: object, url: url };
+      })
+    );
+  }
+}
diff --git a/src/app/process-page/process-breadcrumbs.service.spec.ts b/src/app/process-page/process-breadcrumbs.service.spec.ts
new file mode 100644
index 00000000000..7751c985cef
--- /dev/null
+++ b/src/app/process-page/process-breadcrumbs.service.spec.ts
@@ -0,0 +1,36 @@
+import { async, TestBed } from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { Process } from './processes/process.model';
+
+describe('ProcessBreadcrumbsService', () => {
+  let service: ProcessBreadcrumbsService;
+  let exampleId;
+  let exampleScriptName;
+  let exampleProcess;
+  let exampleURL;
+
+  function init() {
+    exampleId = '12345';
+    exampleScriptName = 'Example Script';
+    exampleProcess = Object.assign(new Process(), {processId: exampleId, scriptName: exampleScriptName});
+    exampleURL = 'example.com';
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new ProcessBreadcrumbsService();
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return a breadcrumb based on a id and scriptName of the process', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleProcess, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(exampleId + ' - ' + exampleScriptName, exampleURL)] });
+    })
+  });
+});
diff --git a/src/app/process-page/process-breadcrumbs.service.ts b/src/app/process-page/process-breadcrumbs.service.ts
new file mode 100644
index 00000000000..ffd289e04ef
--- /dev/null
+++ b/src/app/process-page/process-breadcrumbs.service.ts
@@ -0,0 +1,21 @@
+import { Observable, of as observableOf } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { BreadcrumbsService } from '../core/breadcrumbs/breadcrumbs.service';
+import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { Process } from './processes/process.model';
+
+/**
+ * Service to calculate process breadcrumbs for a single part of the route
+ */
+@Injectable()
+export class ProcessBreadcrumbsService implements BreadcrumbsService<Process> {
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   * @param url The url to use as a link for this breadcrumb
+   */
+  getBreadcrumbs(key: Process, url: string): Observable<Breadcrumb[]> {
+    return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+  }
+}
diff --git a/src/app/process-page/process-page-routing.module.ts b/src/app/process-page/process-page-routing.module.ts
new file mode 100644
index 00000000000..881ca0e8537
--- /dev/null
+++ b/src/app/process-page/process-page-routing.module.ts
@@ -0,0 +1,50 @@
+import { RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { NewProcessComponent } from './new/new-process.component';
+import { ProcessOverviewComponent } from './overview/process-overview.component';
+import { ProcessPageResolver } from './process-page.resolver';
+import { ProcessDetailComponent } from './detail/process-detail.component';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { breadcrumbKey: 'process.overview' },
+        canActivate: [AuthenticatedGuard],
+        children: [
+          {
+            path: '',
+            component: ProcessOverviewComponent,
+            data: { title: 'process.overview.title' },
+          },
+          {
+            path: 'new',
+            component: NewProcessComponent,
+            resolve: { breadcrumb: I18nBreadcrumbResolver },
+            data: { title: 'process.new.title', breadcrumbKey: 'process.new' }
+          },
+          {
+            path: ':id',
+            component: ProcessDetailComponent,
+            resolve: {
+              process: ProcessPageResolver,
+              breadcrumb: ProcessBreadcrumbResolver
+            }
+          }
+        ]
+      },
+
+    ])
+  ],
+  providers: [
+    ProcessPageResolver
+  ]
+})
+export class ProcessPageRoutingModule {
+
+}
diff --git a/src/app/process-page/process-page-routing.paths.ts b/src/app/process-page/process-page-routing.paths.ts
new file mode 100644
index 00000000000..d8a95d8177f
--- /dev/null
+++ b/src/app/process-page/process-page-routing.paths.ts
@@ -0,0 +1,9 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+
+export const PROCESS_MODULE_PATH = 'processes';
+
+export const getProcessListRoute = () =>
+    `/${PROCESS_MODULE_PATH}`;
+
+export const getProcessDetailRoute = (processId: string) =>
+    new URLCombiner(getProcessListRoute(), processId).toString();
diff --git a/src/app/process-page/process-page.module.ts b/src/app/process-page/process-page.module.ts
new file mode 100644
index 00000000000..44e3f627010
--- /dev/null
+++ b/src/app/process-page/process-page.module.ts
@@ -0,0 +1,51 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../shared/shared.module';
+import { ProcessPageRoutingModule } from './process-page-routing.module';
+import { NewProcessComponent } from './new/new-process.component';
+import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component';
+import { ScriptHelpComponent } from './form/script-help/script-help.component';
+import { ParameterSelectComponent } from './form/process-parameters/parameter-select/parameter-select.component';
+import { ProcessParametersComponent } from './form/process-parameters/process-parameters.component';
+import { StringValueInputComponent } from './form/process-parameters/parameter-value-input/string-value-input/string-value-input.component';
+import { ParameterValueInputComponent } from './form/process-parameters/parameter-value-input/parameter-value-input.component';
+import { FileValueInputComponent } from './form/process-parameters/parameter-value-input/file-value-input/file-value-input.component';
+import { BooleanValueInputComponent } from './form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component';
+import { DateValueInputComponent } from './form/process-parameters/parameter-value-input/date-value-input/date-value-input.component';
+import { ProcessOverviewComponent } from './overview/process-overview.component';
+import { ProcessDetailComponent } from './detail/process-detail.component';
+import { ProcessDetailFieldComponent } from './detail/process-detail-field/process-detail-field.component';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { ProcessFormComponent } from './form/process-form.component';
+
+@NgModule({
+  imports: [
+    ProcessPageRoutingModule,
+    SharedModule,
+  ],
+  declarations: [
+    NewProcessComponent,
+    ScriptsSelectComponent,
+    ScriptHelpComponent,
+    ParameterSelectComponent,
+    ProcessParametersComponent,
+    StringValueInputComponent,
+    ParameterValueInputComponent,
+    FileValueInputComponent,
+    BooleanValueInputComponent,
+    DateValueInputComponent,
+    ProcessOverviewComponent,
+    ProcessDetailComponent,
+    ProcessDetailFieldComponent,
+    ProcessFormComponent
+  ],
+  providers: [
+    ProcessBreadcrumbResolver,
+    ProcessBreadcrumbsService
+  ],
+  entryComponents: []
+})
+
+export class ProcessPageModule {
+
+}
diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts
new file mode 100644
index 00000000000..fe274049a6a
--- /dev/null
+++ b/src/app/process-page/process-page.resolver.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { RemoteData } from '../core/data/remote-data';
+import { Observable } from 'rxjs/internal/Observable';
+import { Process } from './processes/process.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+
+/**
+ * This class represents a resolver that requests a specific process before the route is activated
+ */
+@Injectable()
+export class ProcessPageResolver implements Resolve<RemoteData<Process>> {
+  constructor(private processService: ProcessDataService) {
+  }
+
+  /**
+   * Method for resolving a process based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Process>> Emits the found process based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Process>> {
+    return this.processService.findById(route.params.id, false, followLink('script')).pipe(
+      getFirstCompletedRemoteData(),
+    );
+  }
+}
diff --git a/src/app/process-page/processes/process-parameter.model.ts b/src/app/process-page/processes/process-parameter.model.ts
new file mode 100644
index 00000000000..a3ce62c5c68
--- /dev/null
+++ b/src/app/process-page/processes/process-parameter.model.ts
@@ -0,0 +1,14 @@
+/**
+ * A parameter used for running a process
+ */
+export class ProcessParameter {
+  /**
+   * The name of the parameter Eg. '-d', '-f' etc.
+   */
+  name: string;
+
+  /**
+   * The value of the parameter
+   */
+  value: any;
+}
diff --git a/src/app/process-page/processes/process-status.model.ts b/src/app/process-page/processes/process-status.model.ts
new file mode 100644
index 00000000000..b43340bffb7
--- /dev/null
+++ b/src/app/process-page/processes/process-status.model.ts
@@ -0,0 +1,9 @@
+/**
+ * List of process statuses
+ */
+export enum ProcessStatus {
+  SCHEDULED,
+  RUNNING,
+  COMPLETED,
+  FAILED
+}
diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts
new file mode 100644
index 00000000000..74bb82b890b
--- /dev/null
+++ b/src/app/process-page/processes/process.model.ts
@@ -0,0 +1,97 @@
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type';
+import { ProcessStatus } from './process-status.model';
+import { ProcessParameter } from './process-parameter.model';
+import { CacheableObject } from '../../core/cache/object-cache.reducer';
+import { HALLink } from '../../core/shared/hal-link.model';
+import { autoserialize, deserialize } from 'cerialize';
+import { PROCESS } from './process.resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { link, typedObject } from '../../core/cache/builders/build-decorators';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { SCRIPT } from '../scripts/script.resource-type';
+import { Script } from '../scripts/script.model';
+
+/**
+ * Object representing a process
+ */
+@typedObject
+export class Process implements CacheableObject {
+  static type = PROCESS;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The identifier for this process
+   */
+  @autoserialize
+  processId: string;
+
+  /**
+   * The UUID for the user that started the process
+   */
+  @autoserialize
+  userId: string;
+
+  /**
+   * The start time for this process
+   */
+  @autoserialize
+  startTime: string;
+
+  /**
+   * The end time for this process
+   */
+  @autoserialize
+  endTime: string;
+
+  /**
+   * The name of the script run by this process
+   */
+  @autoserialize
+  scriptName: string;
+
+  /**
+   * The status of this process
+   */
+  @autoserialize
+  processStatus: ProcessStatus;
+
+  /**
+   * The parameters for this process
+   */
+  @autoserialize
+  parameters: ProcessParameter[];
+
+  /**
+   * The {@link HALLink}s for this Process
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+    script: HALLink,
+    output: HALLink,
+    files: HALLink
+  };
+
+  /**
+   * The Script that created this Process
+   * Will be undefined unless the script {@link HALLink} has been resolved.
+   */
+  @link(SCRIPT)
+  script?: Observable<RemoteData<Script>>;
+
+  /**
+   * The output logs created by this Process
+   * Will be undefined unless the output {@link HALLink} has been resolved.
+   */
+  @link(PROCESS_OUTPUT_TYPE)
+  output?: Observable<RemoteData<Bitstream>>;
+}
diff --git a/src/app/process-page/processes/process.resource-type.ts b/src/app/process-page/processes/process.resource-type.ts
new file mode 100644
index 00000000000..47617ed4f42
--- /dev/null
+++ b/src/app/process-page/processes/process.resource-type.ts
@@ -0,0 +1,9 @@
+/**
+ * The resource type for Process
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const PROCESS = new ResourceType('process');
diff --git a/src/app/process-page/scripts/script-parameter-type.model.ts b/src/app/process-page/scripts/script-parameter-type.model.ts
new file mode 100644
index 00000000000..2b9fd358bff
--- /dev/null
+++ b/src/app/process-page/scripts/script-parameter-type.model.ts
@@ -0,0 +1,10 @@
+/**
+ * List of parameter types used for scripts
+ */
+export enum ScriptParameterType {
+  STRING = 'String',
+  DATE = 'date',
+  BOOLEAN = 'boolean',
+  FILE = 'InputStream',
+  OUTPUT = 'OutputStream'
+}
diff --git a/src/app/process-page/scripts/script-parameter.model.ts b/src/app/process-page/scripts/script-parameter.model.ts
new file mode 100644
index 00000000000..d6debe7dd70
--- /dev/null
+++ b/src/app/process-page/scripts/script-parameter.model.ts
@@ -0,0 +1,31 @@
+import { ScriptParameterType } from './script-parameter-type.model';
+
+/**
+ * A parameter that can be used when running a script
+ */
+export class ScriptParameter {
+  /**
+   * The name of the parameter Eg. '-d', '-f' etc.
+   */
+  name: string;
+
+  /**
+   * Short description about the purpose of this parameter
+   */
+  description: string;
+
+  /**
+   * The type of parameter
+   */
+  type: ScriptParameterType;
+
+  /**
+   * The long name for this parameter Eg. '--directory', '--force' etc.
+   */
+  nameLong: string;
+
+  /**
+   * Whether or not this parameter is mandatory
+   */
+  mandatory: boolean;
+}
diff --git a/src/app/process-page/scripts/script.model.ts b/src/app/process-page/scripts/script.model.ts
new file mode 100644
index 00000000000..e94d233fc2c
--- /dev/null
+++ b/src/app/process-page/scripts/script.model.ts
@@ -0,0 +1,55 @@
+import { CacheableObject } from '../../core/cache/object-cache.reducer';
+import { HALLink } from '../../core/shared/hal-link.model';
+import { autoserialize, deserialize } from 'cerialize';
+import { SCRIPT } from './script.resource-type';
+import { ScriptParameter } from './script-parameter.model';
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { ResourceType } from '../../core/shared/resource-type';
+
+/**
+ * Object representing a script
+ */
+@typedObject
+export class Script implements CacheableObject {
+  static type = SCRIPT;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The identifier of this script
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * The name of this script
+   */
+  @autoserialize
+  name: string;
+
+  /**
+   * A short description of this script
+   */
+  @autoserialize
+  description: string;
+
+  /**
+   * The available parameters for this script
+   */
+  @autoserialize
+  parameters: ScriptParameter[];
+
+  /**
+   * The {@link HALLink}s for this Script
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/process-page/scripts/script.resource-type.ts b/src/app/process-page/scripts/script.resource-type.ts
new file mode 100644
index 00000000000..2b8c106191a
--- /dev/null
+++ b/src/app/process-page/scripts/script.resource-type.ts
@@ -0,0 +1,9 @@
+/**
+ * The resource type for Script
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const SCRIPT = new ResourceType('script');
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index c1216cbb5f9..1824a1843f4 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -1,8 +1,9 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import {
   DynamicFormControlModel,
   DynamicFormValueControlModel,
-  DynamicInputModel, DynamicSelectModel
+  DynamicInputModel,
+  DynamicSelectModel
 } from '@ng-dynamic-forms/core';
 import { FormGroup } from '@angular/forms';
 import { EPerson } from '../../core/eperson/models/eperson.model';
@@ -11,7 +12,7 @@ import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { LangConfig } from '../../../config/lang-config.interface';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { cloneDeep } from 'lodash';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../core/shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../core/shared/operators';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { environment } from '../../../environments/environment';
@@ -194,7 +195,7 @@ export class ProfilePageMetadataFormComponent implements OnInit {
 
     if (changed) {
       this.epersonService.update(Object.assign(cloneDeep(this.user), {metadata: newMetadata})).pipe(
-        getSucceededRemoteData(),
+        getFirstSucceededRemoteData(),
         getRemoteDataPayload()
       ).subscribe((user) => {
         this.user = user;
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 50a081c6f2a..ad9f7682970 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -1,9 +1,10 @@
-<div class="container-fluid mb-4">{{'profile.security.form.info' | translate}}</div>
+<div class="container-fluid mb-4">{{FORM_PREFIX + 'info' | translate}}</div>
 <ds-form *ngIf="formModel"
-         [formId]="'profile-page-security-form-id'"
+         [formId]="FORM_PREFIX"
          [formModel]="formModel"
          [formGroup]="formGroup"
          [displaySubmit]="false">
 </ds-form>
-<div class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{'profile.security.form.error.password-length' | translate}}</div>
-<div class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{'profile.security.form.error.matching-passwords' | translate}}</div>
+<div id="notLongEnough" class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{FORM_PREFIX + 'error.password-length' | translate}}</div>
+<div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
+<div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
index 225bd8507ec..ba487f71583 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
@@ -1,5 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { TranslateModule } from '@ngx-translate/core';
@@ -15,18 +14,10 @@ describe('ProfilePageSecurityFormComponent', () => {
   let component: ProfilePageSecurityFormComponent;
   let fixture: ComponentFixture<ProfilePageSecurityFormComponent>;
 
-  let user;
-
   let epersonService;
   let notificationsService;
 
   function init() {
-    user = Object.assign(new EPerson(), {
-      _links: {
-        self: { href: 'user-selflink' }
-      }
-    });
-
     epersonService = jasmine.createSpyObj('epersonService', {
       patch: observableOf(new RestResponse(true, 200, 'OK'))
     });
@@ -43,8 +34,8 @@ describe('ProfilePageSecurityFormComponent', () => {
       declarations: [ProfilePageSecurityFormComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: EPersonDataService, useValue: epersonService },
-        { provide: NotificationsService, useValue: notificationsService },
+        {provide: EPersonDataService, useValue: epersonService},
+        {provide: NotificationsService, useValue: notificationsService},
         FormBuilderService
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -54,65 +45,35 @@ describe('ProfilePageSecurityFormComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(ProfilePageSecurityFormComponent);
     component = fixture.componentInstance;
-    component.user = user;
     fixture.detectChanges();
   });
 
-  describe('updateSecurity', () => {
-    describe('when no values changed', () => {
-      let result;
-
+  describe('On value change', () => {
+    describe('when the password has changed', () => {
       beforeEach(() => {
-        result = component.updateSecurity();
+        component.formGroup.patchValue({password: 'password'});
+        component.formGroup.patchValue({passwordrepeat: 'password'});
       });
 
-      it('should return false', () => {
-        expect(result).toEqual(false);
-      });
+      it('should emit the value and validity on password change with invalid validity', fakeAsync(() => {
+        spyOn(component.passwordValue, 'emit');
+        spyOn(component.isInvalid, 'emit');
+        component.formGroup.patchValue({password: 'new-password'});
 
-      it('should not call epersonService.patch', () => {
-        expect(epersonService.patch).not.toHaveBeenCalled();
-      });
-    });
+        tick(300);
 
-    describe('when password is filled in, but the confirm field is empty', () => {
-      let result;
+        expect(component.passwordValue.emit).toHaveBeenCalledWith('new-password');
+        expect(component.isInvalid.emit).toHaveBeenCalledWith(true);
+      }));
 
-      beforeEach(() => {
-        setModelValue('password', 'test');
-        result = component.updateSecurity();
-      });
+      it('should emit the value on password change', fakeAsync(() => {
+        spyOn(component.passwordValue, 'emit');
+        component.formGroup.patchValue({password: 'new-password'});
 
-      it('should return true', () => {
-        expect(result).toEqual(true);
-      });
-    });
+        tick(300);
 
-    describe('when both password fields are filled in, long enough and equal', () => {
-      let result;
-      let operations;
-
-      beforeEach(() => {
-        setModelValue('password', 'testest');
-        setModelValue('passwordrepeat', 'testest');
-        operations = [{ op: 'replace', path: '/password', value: 'testest' }];
-        result = component.updateSecurity();
-      });
-
-      it('should return true', () => {
-        expect(result).toEqual(true);
-      });
-
-      it('should return call epersonService.patch', () => {
-        expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
-      });
+        expect(component.passwordValue.emit).toHaveBeenCalledWith('new-password');
+      }));
     });
   });
-
-  function setModelValue(id: string, value: string) {
-    component.formGroup.patchValue({
-      [id]: value
-    });
-    component.formGroup.markAllAsTouched();
-  }
 });
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index b8ac07e6d8c..1013cad44b9 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -1,16 +1,12 @@
-import { Component, Input, OnInit } from '@angular/core';
-import {
-  DynamicFormControlModel,
-  DynamicFormService,
-  DynamicInputModel
-} from '@ng-dynamic-forms/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import { FormGroup } from '@angular/forms';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { hasValue, isEmpty } from '../../shared/empty.util';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { ErrorResponse, RestResponse } from '../../core/cache/response.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { debounceTime, map } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'ds-profile-page-security-form',
@@ -21,10 +17,15 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
  * Displays a form containing a password field and a confirmation of the password
  */
 export class ProfilePageSecurityFormComponent implements OnInit {
+
+  /**
+   * Emits the validity of the password
+   */
+  @Output() isInvalid = new EventEmitter<boolean>();
   /**
-   * The user to display the form for
+   * Emits the value of the password
    */
-  @Input() user: EPerson;
+  @Output() passwordValue = new EventEmitter<string>();
 
   /**
    * The form's input models
@@ -48,14 +49,17 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   formGroup: FormGroup;
 
   /**
-   * Prefix for the notification messages of this component
+   * Indicates whether the "checkPasswordEmpty" needs to be added or not
    */
-  NOTIFICATIONS_PREFIX = 'profile.security.form.notifications.';
+  @Input()
+  passwordCanBeEmpty = true;
 
   /**
    * Prefix for the form's label messages of this component
    */
-  LABEL_PREFIX = 'profile.security.form.label.';
+  @Input()
+  FORM_PREFIX: string;
+  private subs: Subscription[] = [];
 
   constructor(protected formService: DynamicFormService,
               protected translate: TranslateService,
@@ -64,12 +68,35 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.formGroup = this.formService.createFormGroup(this.formModel, { validators: [this.checkPasswordsEqual, this.checkPasswordLength] });
+    if (this.passwordCanBeEmpty) {
+      this.formGroup = this.formService.createFormGroup(this.formModel,
+        {validators: [this.checkPasswordsEqual, this.checkPasswordLength]});
+    } else {
+      this.formGroup = this.formService.createFormGroup(this.formModel,
+        {validators: [this.checkPasswordsEqual, this.checkPasswordLength, this.checkPasswordEmpty]});
+    }
     this.updateFieldTranslations();
     this.translate.onLangChange
       .subscribe(() => {
         this.updateFieldTranslations();
       });
+
+    this.subs.push(this.formGroup.statusChanges.pipe(
+      debounceTime(300),
+      map((status: string) => {
+        if (status !== 'VALID') {
+          return true;
+        } else {
+          return false;
+        }
+      })).subscribe((status) => this.isInvalid.emit(status))
+    );
+
+    this.subs.push(this.formGroup.valueChanges.pipe(
+      debounceTime(300),
+    ).subscribe((valueChange) => {
+      this.passwordValue.emit(valueChange.password);
+    }));
   }
 
   /**
@@ -78,7 +105,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   updateFieldTranslations() {
     this.formModel.forEach(
       (fieldModel: DynamicInputModel) => {
-        fieldModel.label = this.translate.instant(this.LABEL_PREFIX + fieldModel.id);
+        fieldModel.label = this.translate.instant(this.FORM_PREFIX + 'label.' + fieldModel.id);
       }
     );
   }
@@ -91,7 +118,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     const pass = group.get('password').value;
     const repeatPass = group.get('passwordrepeat').value;
 
-    return pass === repeatPass ? null : { notSame: true };
+    return pass === repeatPass ? null : {notSame: true};
   }
 
   /**
@@ -101,51 +128,24 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   checkPasswordLength(group: FormGroup) {
     const pass = group.get('password').value;
 
-    return isEmpty(pass) || pass.length >= 6 ? null : { notLongEnough: true };
+    return isEmpty(pass) || pass.length >= 6 ? null : {notLongEnough: true};
   }
 
   /**
-   * Update the user's security details
-   *
-   * Sends a patch request for changing the user's password when a new password is present and the password confirmation
-   * matches the new password.
-   * Nothing happens when no passwords are filled in.
-   * An error notification is displayed when the password confirmation does not match the new password.
-   *
-   * Returns false when nothing happened
+   * Checks if the password is empty
+   * @param group The FormGroup to validate
    */
-  updateSecurity() {
-    const pass = this.formGroup.get('password').value;
-    const passEntered = isNotEmpty(pass);
-    if (!this.formGroup.valid) {
-      if (passEntered) {
-        if (this.checkPasswordsEqual(this.formGroup) != null) {
-          this.notificationsService.error(this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.not-same'));
-        }
-        if (this.checkPasswordLength(this.formGroup) != null) {
-          this.notificationsService.error(this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.not-long-enough'));
-        }
-        return true;
-      }
-      return false;
-    }
-    if (passEntered) {
-      const operation = Object.assign({ op: 'replace', path: '/password', value: pass });
-      this.epersonService.patch(this.user, [operation]).subscribe((response: RestResponse) => {
-        if (response.isSuccessful) {
-          this.notificationsService.success(
-            this.translate.instant(this.NOTIFICATIONS_PREFIX + 'success.title'),
-            this.translate.instant(this.NOTIFICATIONS_PREFIX + 'success.content')
-          );
-        } else {
-          this.notificationsService.error(
-            this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.title'), (response as ErrorResponse).errorMessage
-          );
-        }
-      });
-
-    }
+  checkPasswordEmpty(group: FormGroup) {
+    const pass = group.get('password').value;
+    return isEmpty(pass) ? {emptyPassword: true} : null;
+  }
 
-    return passEntered;
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
   }
 }
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index b6e62665b4b..ab8f1ce026c 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -10,7 +10,11 @@ <h3 class="mb-4">{{'profile.head' | translate}}</h3>
     <div class="card mb-4">
       <div class="card-header">{{'profile.card.security' | translate}}</div>
       <div class="card-body">
-        <ds-profile-page-security-form [user]="user"></ds-profile-page-security-form>
+        <ds-profile-page-security-form
+                [FORM_PREFIX]="'profile.security.form.'"
+                (isInvalid)="setInvalid($event)"
+                (passwordValue)="setPasswordValue($event)"
+        ></ds-profile-page-security-form>
       </div>
     </div>
     <button class="btn btn-outline-primary" (click)="updateProfile()">{{'profile.form.submit' | translate}}</button>
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index d63aba46f5b..418626e4d13 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -13,8 +13,9 @@ import { NotificationsService } from '../shared/notifications/notifications.serv
 import { authReducer } from '../core/auth/auth.reducer';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { createPaginatedList } from '../shared/testing/utils.test';
-import { of } from 'rxjs/internal/observable/of';
+import { of as observableOf } from 'rxjs';
 import { AuthService } from '../core/auth/auth.service';
+import { RestResponse } from '../core/cache/response.models';
 
 describe('ProfilePageComponent', () => {
   let component: ProfilePageComponent;
@@ -40,10 +41,11 @@ describe('ProfilePageComponent', () => {
     };
 
     authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: of(user)
+      getAuthenticatedUserFromStore: observableOf(user)
     });
     epersonService = jasmine.createSpyObj('epersonService', {
-      findById: createSuccessfulRemoteDataObject$(user)
+      findById: createSuccessfulRemoteDataObject$(user),
+      patch: observableOf(Object.assign(new RestResponse(true, 200, 'Success')))
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
@@ -84,9 +86,7 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: false
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: true
-        });
+        spyOn(component, 'updateSecurity').and.returnValue(true);
         component.updateProfile();
       });
 
@@ -100,9 +100,6 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: true
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: false
-        });
         component.updateProfile();
       });
 
@@ -116,9 +113,6 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: true
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: true
-        });
         component.updateProfile();
       });
 
@@ -132,9 +126,6 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: false
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: false
-        });
         component.updateProfile();
       });
 
@@ -143,4 +134,60 @@ describe('ProfilePageComponent', () => {
       });
     });
   });
+
+  describe('updateSecurity', () => {
+    describe('when no password value present', () => {
+      let result;
+
+      beforeEach(() => {
+        component.setPasswordValue('');
+
+        result = component.updateSecurity();
+      });
+
+      it('should return false', () => {
+        expect(result).toEqual(false);
+      });
+
+      it('should not call epersonService.patch', () => {
+        expect(epersonService.patch).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when password is filled in, but the password is invalid', () => {
+      let result;
+
+      beforeEach(() => {
+        component.setPasswordValue('test');
+        component.setInvalid(true);
+        result = component.updateSecurity();
+      });
+
+      it('should return true', () => {
+        expect(result).toEqual(true);
+        expect(epersonService.patch).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when password is filled in, and is valid', () => {
+      let result;
+      let operations;
+
+      beforeEach(() => {
+        component.setPasswordValue('testest');
+        component.setInvalid(false);
+
+        operations = [{op: 'add', path: '/password', value: 'testest'}];
+        result = component.updateSecurity();
+      });
+
+      it('should return true', () => {
+        expect(result).toEqual(true);
+      });
+
+      it('should return call epersonService.patch', () => {
+        expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
+      });
+    });
+  });
 });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 8f4cd492a20..16f866e80e9 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -2,18 +2,22 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
-import { ProfilePageSecurityFormComponent } from './profile-page-security-form/profile-page-security-form.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Group } from '../core/eperson/models/group.model';
 import { RemoteData } from '../core/data/remote-data';
-import { PaginatedList } from '../core/data/paginated-list';
+import { PaginatedList } from '../core/data/paginated-list.model';
 import { filter, switchMap, tap } from 'rxjs/operators';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../core/shared/operators';
-import { hasValue } from '../shared/empty.util';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+  getFirstCompletedRemoteData
+} from '../core/shared/operators';
+import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { AuthService } from '../core/auth/auth.service';
+import { Operation } from 'fast-json-patch';
 
 @Component({
   selector: 'ds-profile-page',
@@ -26,15 +30,10 @@ export class ProfilePageComponent implements OnInit {
   /**
    * A reference to the metadata form component
    */
-  @ViewChild(ProfilePageMetadataFormComponent, { static: false }) metadataForm: ProfilePageMetadataFormComponent;
+  @ViewChild(ProfilePageMetadataFormComponent, {static: false}) metadataForm: ProfilePageMetadataFormComponent;
 
   /**
-   * A reference to the security form component
-   */
-  @ViewChild(ProfilePageSecurityFormComponent, { static: false }) securityForm: ProfilePageSecurityFormComponent;
-
-  /**
-   * The authenticated user
+   * The authenticated user as observable
    */
   user$: Observable<EPerson>;
 
@@ -48,6 +47,26 @@ export class ProfilePageComponent implements OnInit {
    */
   NOTIFICATIONS_PREFIX = 'profile.notifications.';
 
+  /**
+   * Prefix for the notification messages of this security form
+   */
+  PASSWORD_NOTIFICATIONS_PREFIX = 'profile.security.form.notifications.';
+
+  /**
+   * The validity of the password filled in, in the security form
+   */
+  private invalidSecurity: boolean;
+
+  /**
+   * The password filled in, in the security form
+   */
+  private password: string;
+
+  /**
+   * The authenticated user
+   */
+  private currentUser: EPerson;
+
   constructor(private authService: AuthService,
               private notificationsService: NotificationsService,
               private translate: TranslateService,
@@ -57,9 +76,10 @@ export class ProfilePageComponent implements OnInit {
   ngOnInit(): void {
     this.user$ = this.authService.getAuthenticatedUserFromStore().pipe(
       filter((user: EPerson) => hasValue(user.id)),
-      switchMap((user: EPerson) => this.epersonService.findById(user.id, followLink('groups'))),
+      switchMap((user: EPerson) => this.epersonService.findById(user.id, true, followLink('groups'))),
       getAllSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
+      tap((user: EPerson) => this.currentUser = user)
     );
     this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
   }
@@ -70,7 +90,7 @@ export class ProfilePageComponent implements OnInit {
    */
   updateProfile() {
     const metadataChanged = this.metadataForm.updateProfile();
-    const securityChanged = this.securityForm.updateSecurity();
+    const securityChanged = this.updateSecurity();
     if (!metadataChanged && !securityChanged) {
       this.notificationsService.warning(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.title'),
@@ -78,4 +98,63 @@ export class ProfilePageComponent implements OnInit {
       );
     }
   }
+
+  /**
+   * Sets the validity of the password based on an emitted of the form
+   * @param $event
+   */
+  setInvalid($event: boolean) {
+    this.invalidSecurity = $event;
+  }
+
+  /**
+   * Update the user's security details
+   *
+   * Sends a patch request for changing the user's password when a new password is present and the password confirmation
+   * matches the new password.
+   * Nothing happens when no passwords are filled in.
+   * An error notification is displayed when the password confirmation does not match the new password.
+   *
+   * Returns false when the password was empty
+   */
+  updateSecurity() {
+    const passEntered = isNotEmpty(this.password);
+
+    if (this.invalidSecurity) {
+      this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general'));
+    }
+    if (!this.invalidSecurity && passEntered) {
+      const operation = {op: 'add', path: '/password', value: this.password} as Operation;
+      this.epersonService.patch(this.currentUser, [operation]).pipe(
+        getFirstCompletedRemoteData()
+      ).subscribe((response: RemoteData<EPerson>) => {
+        if (response.hasSucceeded) {
+          this.notificationsService.success(
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.title'),
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content')
+          );
+        } else {
+          this.notificationsService.error(
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.title'), response.errorMessage
+          );
+        }
+      });
+    }
+    return passEntered;
+  }
+
+  /**
+   * Set the password value based on the value emitted from the security form
+   * @param $event
+   */
+  setPasswordValue($event: string) {
+    this.password = $event;
+  }
+
+  /**
+   * Submit of the security form that triggers the updateProfile method
+   */
+  submit() {
+    this.updateProfile();
+  }
 }
diff --git a/src/app/profile-page/profile-page.module.ts b/src/app/profile-page/profile-page.module.ts
index f40c125ff8d..54b59c97ce8 100644
--- a/src/app/profile-page/profile-page.module.ts
+++ b/src/app/profile-page/profile-page.module.ts
@@ -12,6 +12,9 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     CommonModule,
     SharedModule
   ],
+  exports: [
+    ProfilePageSecurityFormComponent
+  ],
   declarations: [
     ProfilePageComponent,
     ProfilePageMetadataFormComponent,
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
new file mode 100644
index 00000000000..e47eedb6ae2
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -0,0 +1,36 @@
+<div class="container">
+    <h2>{{MESSAGE_PREFIX + '.header'|translate}}</h2>
+    <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
+
+    <form [class]="'ng-invalid'" [formGroup]="form" (ngSubmit)="register()">
+
+        <div class="form-group">
+            <div class="row">
+                <div class="col-12">
+                    <label class="font-weight-bold"
+                           for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
+                    <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
+                           type="text" id="email" formControlName="email"/>
+                    <div *ngIf="email.invalid && (email.dirty || email.touched)"
+                         class="invalid-feedback show-feedback">
+                    <span *ngIf="email.errors && email.errors.required">
+                        {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
+                    </span>
+                    <span *ngIf="email.errors && email.errors.pattern">
+                        {{ MESSAGE_PREFIX + '.email.error.pattern' | translate }}
+                    </span>
+                    </div>
+                </div>
+                <div class="col-12">
+                    {{MESSAGE_PREFIX + '.email.hint' |translate}}
+                </div>
+
+            </div>
+
+        </div>
+    </form>
+    
+    <button class="btn btn-primary"
+            [disabled]="form.invalid"
+            (click)="register()">{{MESSAGE_PREFIX + '.submit'| translate}}</button>
+</div>
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
new file mode 100644
index 00000000000..c44ad64b4e4
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -0,0 +1,93 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../core/cache/response.models';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { Router } from '@angular/router';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { By } from '@angular/platform-browser';
+import { RouterStub } from '../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RegisterEmailFormComponent } from './register-email-form.component';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+
+describe('RegisterEmailComponent', () => {
+
+  let comp: RegisterEmailFormComponent;
+  let fixture: ComponentFixture<RegisterEmailFormComponent>;
+
+  let router;
+  let epersonRegistrationService: EpersonRegistrationService;
+  let notificationsService;
+
+  beforeEach(async(() => {
+
+    router = new RouterStub();
+    notificationsService = new NotificationsServiceStub();
+
+    epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
+      registerEmail: createSuccessfulRemoteDataObject$({})
+    });
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [RegisterEmailFormComponent],
+      providers: [
+        {provide: Router, useValue: router},
+        {provide: EpersonRegistrationService, useValue: epersonRegistrationService},
+        {provide: FormBuilder, useValue: new FormBuilder()},
+        {provide: NotificationsService, useValue: notificationsService},
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RegisterEmailFormComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+  describe('init', () => {
+    it('should initialise the form', () => {
+      const elem = fixture.debugElement.queryAll(By.css('input#email'))[0].nativeElement;
+      expect(elem).toBeDefined();
+    });
+  });
+  describe('email validation', () => {
+    it('should be invalid when no email is present', () => {
+      expect(comp.form.invalid).toBeTrue();
+    });
+    it('should be invalid when no valid email is present', () => {
+      comp.form.patchValue({email: 'invalid'});
+      expect(comp.form.invalid).toBeTrue();
+    });
+    it('should be valid when a valid email is present', () => {
+      comp.form.patchValue({email: 'valid@email.org'});
+      expect(comp.form.invalid).toBeFalse();
+    });
+  });
+  describe('register', () => {
+    it('should send a registration to the service and on success display a message and return to home', () => {
+      comp.form.patchValue({email: 'valid@email.org'});
+
+      comp.register();
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+    });
+    it('should send a registration to the service and on error display a message', () => {
+      (epersonRegistrationService.registerEmail as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 400, 'Bad Request')));
+
+      comp.form.patchValue({email: 'valid@email.org'});
+
+      comp.register();
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(router.navigate).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
new file mode 100644
index 00000000000..d40629f597f
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -0,0 +1,74 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { Registration } from '../core/shared/registration.model';
+import { RemoteData } from '../core/data/remote-data';
+
+@Component({
+  selector: 'ds-register-email-form',
+  templateUrl: './register-email-form.component.html'
+})
+/**
+ * Component responsible to render an email registration form.
+ */
+export class RegisterEmailFormComponent implements OnInit {
+
+  /**
+   * The form containing the mail address
+   */
+  form: FormGroup;
+
+  /**
+   * The message prefix
+   */
+  @Input()
+  MESSAGE_PREFIX: string;
+
+  constructor(
+    private epersonRegistrationService: EpersonRegistrationService,
+    private notificationService: NotificationsService,
+    private translateService: TranslateService,
+    private router: Router,
+    private formBuilder: FormBuilder
+  ) {
+
+  }
+
+  ngOnInit(): void {
+    this.form = this.formBuilder.group({
+      email: new FormControl('', {
+        validators: [Validators.required,
+          Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')
+        ],
+      })
+    });
+
+  }
+
+  /**
+   * Register an email address
+   */
+  register() {
+    if (!this.form.invalid) {
+      this.epersonRegistrationService.registerEmail(this.email.value).subscribe((response: RemoteData<Registration>) => {
+          if (response.hasSucceeded) {
+            this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`),
+              this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value}));
+            this.router.navigate(['/home']);
+          } else {
+            this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`),
+              this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, {email: this.email.value}));
+          }
+        }
+      );
+    }
+  }
+
+  get email() {
+    return this.form.get('email');
+  }
+
+}
diff --git a/src/app/register-email-form/register-email-form.module.ts b/src/app/register-email-form/register-email-form.module.ts
new file mode 100644
index 00000000000..a5fe0899a9d
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { RegisterEmailFormComponent } from './register-email-form.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+  ],
+  declarations: [
+    RegisterEmailFormComponent,
+  ],
+  providers: [],
+  exports: [
+    RegisterEmailFormComponent,
+  ],
+  entryComponents: []
+})
+
+/**
+ * The module that contains the components related to the email registration
+ */
+export class RegisterEmailFormModule {
+
+}
diff --git a/src/app/register-email-form/registration.resolver.spec.ts b/src/app/register-email-form/registration.resolver.spec.ts
new file mode 100644
index 00000000000..0e7dd10cc2b
--- /dev/null
+++ b/src/app/register-email-form/registration.resolver.spec.ts
@@ -0,0 +1,34 @@
+import { RegistrationResolver } from './registration.resolver';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { of as observableOf } from 'rxjs';
+import { Registration } from '../core/shared/registration.model';
+import { first } from 'rxjs/operators';
+
+describe('RegistrationResolver', () => {
+  let resolver: RegistrationResolver;
+  let epersonRegistrationService: EpersonRegistrationService;
+
+  const token = 'test-token';
+  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: token, user:'user-uuid'});
+
+  beforeEach(() => {
+    epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
+      searchByToken: observableOf(registration)
+    });
+    resolver = new RegistrationResolver(epersonRegistrationService);
+  });
+  describe('resolve', () => {
+    it('should resolve a registration based on the token', (done) => {
+      resolver.resolve({params: {token: token}} as any, undefined)
+        .pipe(first())
+        .subscribe(
+          (resolved) => {
+            expect(resolved.token).toEqual(token);
+            expect(resolved.email).toEqual('test@email.org');
+            expect(resolved.user).toEqual('user-uuid');
+            done();
+          }
+        );
+    });
+  });
+});
diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts
new file mode 100644
index 00000000000..64ca2ba9f4c
--- /dev/null
+++ b/src/app/register-email-form/registration.resolver.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { Registration } from '../core/shared/registration.model';
+import { Observable } from 'rxjs';
+
+@Injectable()
+/**
+ * Resolver to resolve a Registration object based on the provided token
+ */
+export class RegistrationResolver implements Resolve<Registration> {
+
+  constructor(private epersonRegistrationService: EpersonRegistrationService) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Registration> {
+    const token = route.params.token;
+    return this.epersonRegistrationService.searchByToken(token);
+  }
+}
diff --git a/src/app/register-page/create-profile/confirmed.validator.spec.ts b/src/app/register-page/create-profile/confirmed.validator.spec.ts
new file mode 100644
index 00000000000..9bbbda9f297
--- /dev/null
+++ b/src/app/register-page/create-profile/confirmed.validator.spec.ts
@@ -0,0 +1,32 @@
+import { FormBuilder, FormControl } from '@angular/forms';
+import { async, fakeAsync } from '@angular/core/testing';
+import { ConfirmedValidator } from './confirmed.validator';
+
+describe('ConfirmedValidator', () => {
+  let passwordForm;
+
+  beforeEach(async(() => {
+
+    passwordForm = (new FormBuilder()).group({
+      password: new FormControl('', {}),
+      confirmPassword: new FormControl('', {})
+    }, {
+      validator: ConfirmedValidator('password', 'confirmPassword')
+    });
+  }));
+
+  it('should validate that the password and confirm password match', fakeAsync(() => {
+
+    passwordForm.get('password').patchValue('test-password');
+    passwordForm.get('confirmPassword').patchValue('test-password-mismatch');
+
+    expect(passwordForm.valid).toBe(false);
+  }));
+
+  it('should invalidate that the password and confirm password match', fakeAsync(() => {
+    passwordForm.get('password').patchValue('test-password');
+    passwordForm.get('confirmPassword').patchValue('test-password');
+
+    expect(passwordForm.valid).toBe(true);
+  }));
+});
diff --git a/src/app/register-page/create-profile/confirmed.validator.ts b/src/app/register-page/create-profile/confirmed.validator.ts
new file mode 100644
index 00000000000..30f4f01701d
--- /dev/null
+++ b/src/app/register-page/create-profile/confirmed.validator.ts
@@ -0,0 +1,19 @@
+import { FormGroup } from '@angular/forms';
+
+/**
+ * Validator used to confirm that the password and confirmed password value are the same
+ */
+export function ConfirmedValidator(controlName: string, matchingControlName: string) {
+  return (formGroup: FormGroup) => {
+    const control = formGroup.controls[controlName];
+    const matchingControl = formGroup.controls[matchingControlName];
+    if (matchingControl.errors && !matchingControl.errors.confirmedValidator) {
+      return;
+    }
+    if (control.value !== matchingControl.value) {
+      matchingControl.setErrors({confirmedValidator: true});
+    } else {
+      matchingControl.setErrors(null);
+    }
+  };
+}
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
new file mode 100644
index 00000000000..cfd6e7ab161
--- /dev/null
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -0,0 +1,91 @@
+<div class="container">
+    <h3 class="mb-4">{{'register-page.create-profile.header' | translate}}</h3>
+    <div class="card mb-4">
+        <div class="card-header">{{'register-page.create-profile.identification.header' | translate}}</div>
+        <div class="card-body">
+            <div class="row">
+                <div class="col-12">
+                    <label class="font-weight-bold"
+                           for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
+                    <span id="email">{{(registration$ |async).email}}</span></div>
+            </div>
+            <form [class]="'ng-invalid'" [formGroup]="userInfoForm" (ngSubmit)="submitEperson()">
+
+                <div class="form-group">
+                    <div class="row">
+                        <div class="col-12">
+                            <label for="firstName">{{'register-page.create-profile.identification.first-name' | translate}}</label>
+                            <input [className]="(firstName.invalid) && (firstName.dirty || firstName.touched) ? 'form-control is-invalid' :'form-control'"
+                                   type="text" id="firstName" formControlName="firstName"/>
+                            <div *ngIf="firstName.invalid && (firstName.dirty || firstName.touched)"
+                                 class="invalid-feedback show-feedback">
+                    <span *ngIf="firstName.errors && firstName.errors.required">
+                        {{ 'register-page.create-profile.identification.first-name.error' | translate }}
+                    </span>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <label
+                                    for="lastName">{{'register-page.create-profile.identification.last-name' | translate}}</label>
+                            <input
+                                    [className]="(lastName.invalid) && (lastName.dirty || lastName.touched) ? 'form-control is-invalid' :'form-control'"
+                                    id="lastName" formControlName="lastName">
+                            <div *ngIf="lastName.invalid && (lastName.dirty || lastName.touched)"
+                                 class="invalid-feedback show-feedback">
+                    <span *ngIf="lastName.errors && lastName.errors.required">
+                        {{ 'register-page.create-profile.identification.last-name.error' | translate }}
+                    </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <label
+                                    for="contactPhone">{{'register-page.create-profile.identification.contact' | translate}}</label>
+                            <input class="form-control" id="contactPhone" formControlName="contactPhone">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <label
+                                    for="language">{{'register-page.create-profile.identification.language' |translate}}</label>
+
+                            <select id="language" formControlName="language" class="form-control">
+                                <option [value]="''"></option>
+                                <option *ngFor="let lang of activeLangs" [value]="lang.code">{{lang.label}}</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <div class="card mb-4">
+        <div class="card-header">{{'register-page.create-profile.security.header' | translate}}</div>
+        <div class="card-body">
+
+            <ds-profile-page-security-form
+                    [passwordCanBeEmpty]="false"
+                    [FORM_PREFIX]="'register-page.create-profile.security.'"
+                    (isInvalid)="setInValid($event)"
+                    (passwordValue)="setPasswordValue($event)"
+            ></ds-profile-page-security-form>
+        </div>
+    </div>
+
+
+    <div class="row">
+        <div class="col-12">
+            <button
+                    [disabled]="isInValidPassword || userInfoForm.invalid"
+                    class="btn btn-default btn-primary"
+                    (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
+        </div>
+    </div>
+
+
+</div>
diff --git a/src/app/register-page/create-profile/create-profile.component.spec.ts b/src/app/register-page/create-profile/create-profile.component.spec.ts
new file mode 100644
index 00000000000..f152ff411db
--- /dev/null
+++ b/src/app/register-page/create-profile/create-profile.component.spec.ts
@@ -0,0 +1,270 @@
+import { CreateProfileComponent } from './create-profile.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Registration } from '../../core/shared/registration.model';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../../core/cache/response.models';
+import { By } from '@angular/platform-browser';
+import { CoreState } from '../../core/core.reducers';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import {
+  END_USER_AGREEMENT_METADATA_FIELD,
+  EndUserAgreementService
+} from '../../core/end-user-agreement/end-user-agreement.service';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+describe('CreateProfileComponent', () => {
+  let comp: CreateProfileComponent;
+  let fixture: ComponentFixture<CreateProfileComponent>;
+
+  let router;
+  let route;
+  let ePersonDataService: EPersonDataService;
+  let notificationsService;
+  let store: Store<CoreState>;
+  let endUserAgreementService: EndUserAgreementService;
+
+  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: 'test-token'});
+
+  let values;
+  let eperson: EPerson;
+  let valuesWithAgreement;
+  let epersonWithAgreement: EPerson;
+
+  beforeEach(async(() => {
+    values = {
+      metadata: {
+        'eperson.firstname': [
+          {
+            value: 'First'
+          }
+        ],
+          'eperson.lastname': [
+          {
+            value: 'Last'
+          },
+        ],
+          'eperson.phone': [
+          {
+            value: 'Phone'
+          }
+        ],
+          'eperson.language': [
+          {
+            value: 'en'
+          }
+        ]
+      },
+      email: 'test@email.org',
+        password: 'password',
+      canLogIn: true,
+      requireCertificate: false
+    };
+    eperson = Object.assign(new EPerson(), values);
+    valuesWithAgreement = {
+      metadata: {
+        'eperson.firstname': [
+          {
+            value: 'First'
+          }
+        ],
+        'eperson.lastname': [
+          {
+            value: 'Last'
+          },
+        ],
+        'eperson.phone': [
+          {
+            value: 'Phone'
+          }
+        ],
+        'eperson.language': [
+          {
+            value: 'en'
+          }
+        ],
+        [END_USER_AGREEMENT_METADATA_FIELD]: [
+          {
+            value: 'true'
+          }
+        ]
+      },
+      email: 'test@email.org',
+      password: 'password',
+      canLogIn: true,
+      requireCertificate: false
+    };
+    epersonWithAgreement = Object.assign(new EPerson(), valuesWithAgreement);
+
+    route = {data: observableOf({registration: registration})};
+    router = new RouterStub();
+    notificationsService = new NotificationsServiceStub();
+
+    ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
+      createEPersonForToken: createSuccessfulRemoteDataObject$({})
+    });
+
+    store = jasmine.createSpyObj('store', {
+      dispatch: {},
+    });
+
+    endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
+      isCookieAccepted: false,
+      removeCookieAccepted: {}
+    });
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [CreateProfileComponent],
+      providers: [
+        {provide: Router, useValue: router},
+        {provide: ActivatedRoute, useValue: route},
+        {provide: Store, useValue: store},
+        {provide: EPersonDataService, useValue: ePersonDataService},
+        {provide: FormBuilder, useValue: new FormBuilder()},
+        {provide: NotificationsService, useValue: notificationsService},
+        {provide: EndUserAgreementService, useValue: endUserAgreementService},
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateProfileComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should initialise mail address', () => {
+      const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement;
+      expect(elem.innerHTML).toContain('test@email.org');
+    });
+    it('should initialise the form', () => {
+      const firstName = fixture.debugElement.queryAll(By.css('input#firstName'))[0].nativeElement;
+      const lastName = fixture.debugElement.queryAll(By.css('input#lastName'))[0].nativeElement;
+      const contactPhone = fixture.debugElement.queryAll(By.css('input#contactPhone'))[0].nativeElement;
+      const language = fixture.debugElement.queryAll(By.css('select#language'))[0].nativeElement;
+
+      expect(firstName).toBeDefined();
+      expect(lastName).toBeDefined();
+      expect(contactPhone).toBeDefined();
+      expect(language).toBeDefined();
+    });
+  });
+
+  describe('submitEperson', () => {
+
+    it('should submit an eperson for creation and log in on success', () => {
+      comp.firstName.patchValue('First');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = false;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).toHaveBeenCalledWith(eperson, 'test-token');
+      expect(store.dispatch).toHaveBeenCalledWith(new AuthenticateAction('test@email.org', 'password'));
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+      expect(notificationsService.success).toHaveBeenCalled();
+    });
+
+    describe('when the end-user-agreement cookie is accepted', () => {
+      beforeEach(() => {
+        (endUserAgreementService.isCookieAccepted as jasmine.Spy).and.returnValue(true);
+      });
+
+      it('should submit an eperson with agreement metadata for creation and log in on success', () => {
+        comp.firstName.patchValue('First');
+        comp.lastName.patchValue('Last');
+        comp.contactPhone.patchValue('Phone');
+        comp.language.patchValue('en');
+        comp.password = 'password';
+        comp.isInValidPassword = false;
+
+        comp.submitEperson();
+
+        expect(ePersonDataService.createEPersonForToken).toHaveBeenCalledWith(epersonWithAgreement, 'test-token');
+        expect(store.dispatch).toHaveBeenCalledWith(new AuthenticateAction('test@email.org', 'password'));
+        expect(router.navigate).toHaveBeenCalledWith(['/home']);
+        expect(notificationsService.success).toHaveBeenCalled();
+      });
+
+      it('should remove the cookie', () => {
+        comp.firstName.patchValue('First');
+        comp.lastName.patchValue('Last');
+        comp.contactPhone.patchValue('Phone');
+        comp.language.patchValue('en');
+        comp.password = 'password';
+        comp.isInValidPassword = false;
+
+        comp.submitEperson();
+
+        expect(endUserAgreementService.removeCookieAccepted).toHaveBeenCalled();
+      });
+    });
+
+    it('should submit an eperson for creation and stay on page on error', () => {
+
+      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
+
+      comp.firstName.patchValue('First');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = false;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).toHaveBeenCalledWith(eperson, 'test-token');
+      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(router.navigate).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+    });
+    it('should submit not create an eperson when the user info form is invalid', () => {
+
+      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
+
+      comp.firstName.patchValue('');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = false;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).not.toHaveBeenCalled();
+    });
+    it('should submit not create an eperson when the password is invalid', () => {
+
+      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
+
+      comp.firstName.patchValue('First');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = true;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).not.toHaveBeenCalled();
+    });
+
+  });
+});
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
new file mode 100644
index 00000000000..5f02556248f
--- /dev/null
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -0,0 +1,174 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { map } from 'rxjs/operators';
+import { Registration } from '../../core/shared/registration.model';
+import { Observable } from 'rxjs';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { LangConfig } from '../../../config/lang-config.interface';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core/core.reducers';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { environment } from '../../../environments/environment';
+import { isEmpty } from '../../shared/empty.util';
+import { RemoteData } from '../../core/data/remote-data';
+import {
+  END_USER_AGREEMENT_METADATA_FIELD,
+  EndUserAgreementService
+} from '../../core/end-user-agreement/end-user-agreement.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+
+/**
+ * Component that renders the create profile page to be used by a user registering through a token
+ */
+@Component({
+  selector: 'ds-create-profile',
+  templateUrl: './create-profile.component.html'
+})
+export class CreateProfileComponent implements OnInit {
+  registration$: Observable<Registration>;
+
+  email: string;
+  token: string;
+
+  isInValidPassword = true;
+  password: string;
+
+  userInfoForm: FormGroup;
+  activeLangs: LangConfig[];
+
+  constructor(
+    private translateService: TranslateService,
+    private ePersonDataService: EPersonDataService,
+    private store: Store<CoreState>,
+    private router: Router,
+    private route: ActivatedRoute,
+    private formBuilder: FormBuilder,
+    private notificationsService: NotificationsService,
+    private endUserAgreementService: EndUserAgreementService
+  ) {
+
+  }
+
+  ngOnInit(): void {
+    this.registration$ = this.route.data.pipe(
+      map((data) => data.registration as Registration),
+    );
+    this.registration$.subscribe((registration: Registration) => {
+      this.email = registration.email;
+      this.token = registration.token;
+    });
+    this.activeLangs = environment.languages.filter((MyLangConfig) => MyLangConfig.active === true);
+
+    this.userInfoForm = this.formBuilder.group({
+      firstName: new FormControl('', {
+        validators: [Validators.required],
+      }),
+      lastName: new FormControl('', {
+        validators: [Validators.required],
+      }),
+      contactPhone: new FormControl(''),
+      language: new FormControl(''),
+    });
+
+  }
+
+  /**
+   * Sets the validity of the password based on a value emitted from the form
+   * @param $event
+   */
+  setInValid($event: boolean) {
+    this.isInValidPassword = $event || isEmpty(this.password);
+  }
+
+  /**
+   * Sets the value of the password based on a value emitted from the form
+   * @param $event
+   */
+  setPasswordValue($event: string) {
+    this.password = $event;
+    this.isInValidPassword = this.isInValidPassword || isEmpty(this.password);
+  }
+
+  get firstName() {
+    return this.userInfoForm.get('firstName');
+  }
+
+  get lastName() {
+    return this.userInfoForm.get('lastName');
+  }
+
+  get contactPhone() {
+    return this.userInfoForm.get('contactPhone');
+  }
+
+  get language() {
+    return this.userInfoForm.get('language');
+  }
+
+  /**
+   * Submits the eperson to the service to be created.
+   * The submission will not be made when the form or the password is not valid.
+   */
+  submitEperson() {
+    if (!(this.userInfoForm.invalid || this.isInValidPassword)) {
+      const values = {
+        metadata: {
+          'eperson.firstname': [
+            {
+              value: this.firstName.value
+            }
+          ],
+          'eperson.lastname': [
+            {
+              value: this.lastName.value
+            },
+          ],
+          'eperson.phone': [
+            {
+              value: this.contactPhone.value
+            }
+          ],
+          'eperson.language': [
+            {
+              value: this.language.value
+            }
+          ]
+        },
+        email: this.email,
+        password: this.password,
+        canLogIn: true,
+        requireCertificate: false
+      };
+
+      // If the End User Agreement cookie is accepted, add end-user agreement metadata to the user
+      if (this.endUserAgreementService.isCookieAccepted()) {
+        values.metadata[END_USER_AGREEMENT_METADATA_FIELD] = [
+          {
+            value: String(true)
+          }
+        ];
+        this.endUserAgreementService.removeCookieAccepted();
+      }
+
+      const eperson = Object.assign(new EPerson(), values);
+      this.ePersonDataService.createEPersonForToken(eperson, this.token).pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((rd: RemoteData<EPerson>) => {
+        if (rd.hasSucceeded) {
+          this.notificationsService.success(this.translateService.get('register-page.create-profile.submit.success.head'),
+            this.translateService.get('register-page.create-profile.submit.success.content'));
+          this.store.dispatch(new AuthenticateAction(this.email, this.password));
+          this.router.navigate(['/home']);
+        } else {
+          this.notificationsService.error(this.translateService.get('register-page.create-profile.submit.error.head'),
+            this.translateService.get('register-page.create-profile.submit.error.content'));
+        }
+      });
+    }
+  }
+
+}
diff --git a/src/app/register-page/register-email/register-email.component.html b/src/app/register-page/register-email/register-email.component.html
new file mode 100644
index 00000000000..a60dc4c31e0
--- /dev/null
+++ b/src/app/register-page/register-email/register-email.component.html
@@ -0,0 +1,3 @@
+<ds-register-email-form
+        [MESSAGE_PREFIX]="'register-page.registration'">
+</ds-register-email-form>
diff --git a/src/app/register-page/register-email/register-email.component.spec.ts b/src/app/register-page/register-email/register-email.component.spec.ts
new file mode 100644
index 00000000000..74bd247d74f
--- /dev/null
+++ b/src/app/register-page/register-email/register-email.component.spec.ts
@@ -0,0 +1,30 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { RegisterEmailComponent } from './register-email.component';
+
+describe('RegisterEmailComponent', () => {
+
+  let comp: RegisterEmailComponent;
+  let fixture: ComponentFixture<RegisterEmailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [RegisterEmailComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RegisterEmailComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  it('should be defined', () => {
+    expect(comp).toBeDefined();
+  });
+});
diff --git a/src/app/register-page/register-email/register-email.component.ts b/src/app/register-page/register-email/register-email.component.ts
new file mode 100644
index 00000000000..ac221c109a3
--- /dev/null
+++ b/src/app/register-page/register-email/register-email.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-register-email',
+  templateUrl: './register-email.component.html'
+})
+/**
+ * Component responsible the email registration step when registering as a new user
+ */
+export class RegisterEmailComponent {
+
+}
diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts
new file mode 100644
index 00000000000..7954d7963a4
--- /dev/null
+++ b/src/app/register-page/register-page-routing.module.ts
@@ -0,0 +1,34 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { RegisterEmailComponent } from './register-email/register-email.component';
+import { CreateProfileComponent } from './create-profile/create-profile.component';
+import { ItemPageResolver } from '../+item-page/item-page.resolver';
+import { RegistrationResolver } from '../register-email-form/registration.resolver';
+import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        component: RegisterEmailComponent,
+        data: {title: 'register-email.title'},
+      },
+      {
+        path: ':token',
+        component: CreateProfileComponent,
+        resolve: {registration: RegistrationResolver},
+        canActivate: [EndUserAgreementCookieGuard]
+      }
+    ])
+  ],
+  providers: [
+    RegistrationResolver,
+    ItemPageResolver
+  ]
+})
+/**
+ * Module related to the navigation to components used to register a new user
+ */
+export class RegisterPageRoutingModule {
+}
diff --git a/src/app/register-page/register-page.module.ts b/src/app/register-page/register-page.module.ts
new file mode 100644
index 00000000000..b29d2ecaaf3
--- /dev/null
+++ b/src/app/register-page/register-page.module.ts
@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { RegisterPageRoutingModule } from './register-page-routing.module';
+import { RegisterEmailComponent } from './register-email/register-email.component';
+import { CreateProfileComponent } from './create-profile/create-profile.component';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { ProfilePageModule } from '../profile-page/profile-page.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    RegisterPageRoutingModule,
+    RegisterEmailFormModule,
+    ProfilePageModule,
+  ],
+  declarations: [
+    RegisterEmailComponent,
+    CreateProfileComponent
+  ],
+  providers: [],
+  entryComponents: []
+})
+
+/**
+ * Module related to components used to register a new user
+ */
+export class RegisterPageModule {
+
+}
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index a05381fee8c..fa92939e0fe 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,7 +1,7 @@
 <ul class="navbar-nav" [ngClass]="{'mr-auto': (isXsOrSm$ | async)}">
   <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
       (click)="$event.stopPropagation();">
-    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+    <div ngbDropdown #loginDrop display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
       <a href="#" id="dropdownLogin" (click)="$event.preventDefault()" ngbDropdownToggle
          class="px-1">{{ 'nav.login' | translate }}</a>
       <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index 67cec78f3b4..bec26b0432a 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -43,11 +43,13 @@ describe('AuthNavMenuComponent', () => {
     notAuthState = {
       authenticated: false,
       loaded: false,
+      blocking: false,
       loading: false
     };
     authState = {
       authenticated: true,
       loaded: true,
+      blocking: false,
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
       userId: EPersonMock.id
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index 909b04c7be2..b15330e84a7 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -34,6 +34,7 @@ describe('UserMenuComponent', () => {
     authState = {
       authenticated: true,
       loaded: true,
+      blocking: false,
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
       userId: EPersonMock.id
@@ -41,6 +42,7 @@ describe('UserMenuComponent', () => {
     authStateLoading = {
       authenticated: true,
       loaded: true,
+      blocking: false,
       loading: true,
       authToken: null,
       userId: EPersonMock.id
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index 81d9b3d555c..1dbcec8eb6c 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -7,8 +7,8 @@ import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { AppState } from '../../../app.reducer';
 import { isAuthenticationLoading } from '../../../core/auth/selectors';
 import { MYDSPACE_ROUTE } from '../../../+my-dspace-page/my-dspace-page.component';
-import { getProfileModulePath } from '../../../app-routing.module';
 import { AuthService } from '../../../core/auth/auth.service';
+import { getProfileModuleRoute } from '../../../app-routing-paths';
 
 /**
  * This component represents the user nav menu.
@@ -41,7 +41,7 @@ export class UserMenuComponent implements OnInit {
   /**
    * The profile page route
    */
-  public profileRoute = getProfileModulePath();
+  public profileRoute = getProfileModuleRoute();
 
   constructor(private store: Store<AppState>,
               private authService: AuthService) {
diff --git a/src/app/shared/authority-confidence/authority-confidence-state.directive.ts b/src/app/shared/authority-confidence/authority-confidence-state.directive.ts
index 410dadfc5f7..c862452a995 100644
--- a/src/app/shared/authority-confidence/authority-confidence-state.directive.ts
+++ b/src/app/shared/authority-confidence/authority-confidence-state.directive.ts
@@ -13,12 +13,13 @@ import {
 
 import { findIndex } from 'lodash';
 
-import { AuthorityValue } from '../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
-import { ConfidenceType } from '../../core/integration/models/confidence-type';
+import { ConfidenceType } from '../../core/shared/confidence-type';
 import { isNotEmpty, isNull } from '../empty.util';
 import { ConfidenceIconConfig } from '../../../config/submission-config.interface';
 import { environment } from '../../../environments/environment';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 
 /**
  * Directive to add to the element a bootstrap utility class based on metadata confidence value
@@ -31,7 +32,7 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
   /**
    * The metadata value
    */
-  @Input() authorityValue: AuthorityValue | FormFieldMetadataValueObject | string;
+  @Input() authorityValue: VocabularyEntry | FormFieldMetadataValueObject | string;
 
   /**
    * A boolean representing if to show html icon if authority value is empty
@@ -65,7 +66,6 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
   /**
    * Initialize instance variables
    *
-   * @param {GlobalConfig} EnvConfig
    * @param {ElementRef} elem
    * @param {Renderer2} renderer
    */
@@ -114,7 +114,8 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
   private getConfidenceByValue(value: any): ConfidenceType {
     let confidence: ConfidenceType = ConfidenceType.CF_UNSET;
 
-    if (isNotEmpty(value) && value instanceof AuthorityValue && value.hasAuthority()) {
+    if (isNotEmpty(value) && (value instanceof VocabularyEntry || value instanceof VocabularyEntryDetail)
+      && value.hasAuthority()) {
       confidence = ConfidenceType.CF_ACCEPTED;
     }
 
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index b21fd2968de..1e5fa5043ac 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -7,8 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { SharedModule } from '../shared.module';
 import { CommonModule } from '@angular/common';
 import { Item } from '../../core/shared/item.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { StoreModule } from '@ngrx/store';
@@ -44,7 +43,7 @@ describe('BrowseByComponent', () => {
       ]
     })
   ];
-  const mockItemsRD$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockItems));
+  const mockItemsRD$ = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockItems));
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 230b0bc1363..8706c39e54a 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Injector, Input, OnInit, Output } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { fadeIn, fadeInOut } from '../animations/fade';
diff --git a/src/app/shared/chips/chips.component.spec.ts b/src/app/shared/chips/chips.component.spec.ts
index accbaf8f34d..c8330a6bfa3 100644
--- a/src/app/shared/chips/chips.component.spec.ts
+++ b/src/app/shared/chips/chips.component.spec.ts
@@ -11,7 +11,7 @@ import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-
 import { createTestComponent } from '../testing/utils.test';
 import { AuthorityConfidenceStateDirective } from '../authority-confidence/authority-confidence-state.directive';
 import { TranslateModule } from '@ngx-translate/core';
-import { ConfidenceType } from '../../core/integration/models/confidence-type';
+import { ConfidenceType } from '../../core/shared/confidence-type';
 import { SortablejsModule } from 'ngx-sortablejs';
 import { environment } from '../../../environments/environment';
 
diff --git a/src/app/shared/chips/models/chips-item.model.ts b/src/app/shared/chips/models/chips-item.model.ts
index d60d29e41e1..5d0ff20e2f6 100644
--- a/src/app/shared/chips/models/chips-item.model.ts
+++ b/src/app/shared/chips/models/chips-item.model.ts
@@ -1,8 +1,8 @@
 import { isObject, uniqueId } from 'lodash';
 import { hasValue, isNotEmpty } from '../../empty.util';
 import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
-import { ConfidenceType } from '../../../core/integration/models/confidence-type';
-import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { ConfidenceType } from '../../../core/shared/confidence-type';
+import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export interface ChipsItemIcon {
   metadata: string;
diff --git a/src/app/shared/chips/models/chips.model.ts b/src/app/shared/chips/models/chips.model.ts
index de694bdcfd3..c15badb976a 100644
--- a/src/app/shared/chips/models/chips.model.ts
+++ b/src/app/shared/chips/models/chips.model.ts
@@ -2,10 +2,10 @@ import { findIndex, isEqual, isObject } from 'lodash';
 import { BehaviorSubject } from 'rxjs';
 import { ChipsItem, ChipsItemIcon } from './chips-item.model';
 import { hasValue, isNotEmpty } from '../../empty.util';
-import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { MetadataIconConfig } from '../../../../config/submission-config.interface';
 import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
-import { AuthorityValue } from '../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export class Chips {
   chipsItems: BehaviorSubject<ChipsItem[]>;
@@ -102,7 +102,7 @@ export class Chips {
 
   private getChipsIcons(item) {
     const icons = [];
-    if (typeof item === 'string' || item instanceof FormFieldMetadataValueObject || item instanceof AuthorityValue) {
+    if (typeof item === 'string' || item instanceof FormFieldMetadataValueObject || item instanceof VocabularyEntry) {
       return icons;
     }
 
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
new file mode 100644
index 00000000000..36269294c17
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -0,0 +1,43 @@
+<div class="form-group w-100 pr-2 pl-2">
+  <input *ngIf="searchField"
+          type="search"
+          class="form-control w-100"
+          (click)="$event.stopPropagation();"
+          placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
+          [formControl]="searchField"
+          #searchFieldEl>
+</div>
+<div class="dropdown-divider"></div>
+<div
+    class="scrollable-menu"
+    aria-labelledby="dropdownMenuButton"
+    (scroll)="onScroll($event)">
+  <div
+    infiniteScroll
+    [infiniteScrollDistance]="2"
+    [infiniteScrollThrottle]="300"
+    [infiniteScrollUpDistance]="1.5"
+    [infiniteScrollContainer]="'.scrollable-menu'"
+    [fromRoot]="true"
+    (scrolled)="onScrollDown()">
+    <button class="dropdown-item disabled" *ngIf="searchListCollection?.length == 0 && !(isLoadingList | async)">
+      {{'submission.sections.general.no-collection' | translate}}
+    </button>
+    <button
+          *ngFor="let listItem of searchListCollection"
+          class="dropdown-item collection-item"
+          title="{{ listItem.collection.name }}"
+          (click)="onSelect(listItem)">
+      <ul class="list-unstyled mb-0">
+        <li class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
+          {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
+        </li>
+        <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</li>
+      </ul>
+    </button>
+    <button class="dropdown-item disabled" *ngIf="(isLoadingList | async)" >
+      <ds-loading message="{{'loading.default' | translate}}">
+      </ds-loading>
+    </button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.scss b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
new file mode 100644
index 00000000000..deecc395103
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
@@ -0,0 +1,15 @@
+.scrollable-menu {
+  height: auto;
+  max-height: $dropdown-menu-max-height;
+  overflow-x: hidden;
+}
+
+.collection-item {
+  border-bottom: $dropdown-border-width solid $dropdown-border-color;
+}
+
+#collectionControlsDropdownMenu {
+  outline: 0;
+  left: 0 !important;
+  box-shadow: $btn-focus-box-shadow;
+}
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
new file mode 100644
index 00000000000..57e965b666f
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
@@ -0,0 +1,230 @@
+import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { CollectionDropdownComponent } from './collection-dropdown.component';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+import { Observable, of } from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { PaginatedList, buildPaginatedList } from 'src/app/core/data/paginated-list.model';
+import { getTestScheduler } from 'jasmine-marbles';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { PageInfo } from 'src/app/core/shared/page-info.model';
+import { Collection } from '../../core/shared/collection.model';
+import { NO_ERRORS_SCHEMA, ChangeDetectorRef, ElementRef } from '@angular/core';
+import { CollectionDataService } from 'src/app/core/data/collection-data.service';
+import { FindListOptions } from 'src/app/core/data/request.models';
+import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { TestScheduler } from 'rxjs/testing';
+import { By } from '@angular/platform-browser';
+import { Community } from 'src/app/core/shared/community.model';
+
+const community: Community = Object.assign(new Community(), {
+  id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+  uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+  name: 'Community 1'
+});
+
+const collections: Collection[] = [
+  Object.assign(new Collection(), {
+    id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    name: 'Collection 1',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 1'
+      }],
+    parentCommunity: createSuccessfulRemoteDataObject$(community)
+  }),
+  Object.assign(new Collection(), {
+    id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    name: 'Collection 2',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 2'
+      }],
+    parentCommunity: createSuccessfulRemoteDataObject$(community)
+  }),
+  Object.assign(new Collection(), {
+    id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+    name: 'Collection 3',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 3'
+      }],
+    parentCommunity: createSuccessfulRemoteDataObject$(community)
+  }),
+  Object.assign(new Collection(), {
+    id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
+    name: 'Collection 4',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 4'
+      }],
+    parentCommunity: createSuccessfulRemoteDataObject$(community)
+  }),
+  Object.assign(new Collection(), {
+    id: 'a5159760-f362-4659-9e81-e3253ad91ede',
+    name: 'Collection 5',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 5'
+      }],
+    parentCommunity: createSuccessfulRemoteDataObject$(community)
+  })
+];
+
+const listElementMock = {
+    communities: [
+      {
+        id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+        name: 'Community 1'
+      }
+    ],
+    collection: {
+      id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      name: 'Collection 3'
+    }
+  };
+
+// tslint:disable-next-line: max-classes-per-file
+class CollectionDataServiceMock {
+  getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<Collection>>): Observable<RemoteData<PaginatedList<Collection>>> {
+    return of(
+        createSuccessfulRemoteDataObject(
+          buildPaginatedList(new PageInfo(), collections)
+        )
+    );
+  }
+}
+
+describe('CollectionDropdownComponent', () => {
+  let component: CollectionDropdownComponent;
+  let fixture: ComponentFixture<CollectionDropdownComponent>;
+  let scheduler: TestScheduler;
+  const searchedCollection = 'TEXT';
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })
+      ],
+      declarations: [ CollectionDropdownComponent ],
+      providers: [
+        {provide: CollectionDataService, useClass: CollectionDataServiceMock},
+        {provide: ChangeDetectorRef, useValue: {}},
+        {provide: ElementRef, userValue: {}}
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+    fixture = TestBed.createComponent(CollectionDropdownComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should populate collections list with five items', () => {
+    const elements = fixture.debugElement.queryAll(By.css('.collection-item'));
+    expect(elements.length).toEqual(5);
+  });
+
+  it('should trigger onSelect method when select a new collection from list', fakeAsync(() => {
+    spyOn(component, 'onSelect');
+    const collectionItem = fixture.debugElement.query(By.css('.collection-item:nth-child(2)'));
+    collectionItem.triggerEventHandler('click', null);
+    fixture.detectChanges();
+    tick();
+    fixture.whenStable().then(() => {
+      expect(component.onSelect).toHaveBeenCalled();
+    });
+  }));
+
+  it('should init component with collection list', fakeAsync(() => {
+    spyOn(component.subs, 'push').and.callThrough();
+    spyOn(component, 'resetPagination').and.callThrough();
+    spyOn(component, 'populateCollectionList').and.callThrough();
+    component.ngOnInit();
+    tick();
+    fixture.detectChanges();
+
+    fixture.whenStable().then(() => {
+      expect(component.subs.push).toHaveBeenCalled();
+      expect(component.resetPagination).toHaveBeenCalled();
+      expect(component.populateCollectionList).toHaveBeenCalled();
+    });
+  }));
+
+  it('should emit collectionChange event when selecting a new collection', () => {
+    spyOn(component.selectionChange, 'emit').and.callThrough();
+    component.ngOnInit();
+    component.onSelect(listElementMock as any);
+    fixture.detectChanges();
+
+    expect(component.selectionChange.emit).toHaveBeenCalledWith(listElementMock as any);
+  });
+
+  it('should reset collections list after reset of searchField', fakeAsync(() => {
+    spyOn(component.subs, 'push').and.callThrough();
+    spyOn(component, 'reset').and.callThrough();
+    spyOn(component.searchField, 'setValue').and.callThrough();
+    spyOn(component, 'resetPagination').and.callThrough();
+    spyOn(component, 'populateCollectionList').and.callThrough();
+    component.reset();
+    const input = fixture.debugElement.query(By.css('input.form-control'));
+    const el = input.nativeElement;
+    el.value = searchedCollection;
+    el.dispatchEvent(new Event('input'));
+    fixture.detectChanges();
+    tick(500);
+
+    fixture.whenStable().then(() => {
+      expect(component.reset).toHaveBeenCalled();
+      expect(component.searchField.setValue).toHaveBeenCalledWith('');
+      expect(component.resetPagination).toHaveBeenCalled();
+      expect(component.currentQuery).toEqual('');
+      expect(component.populateCollectionList).toHaveBeenCalledWith(component.currentQuery, component.currentPage);
+      expect(component.searchListCollection).toEqual(collections as any);
+      expect(component.subs.push).toHaveBeenCalled();
+    });
+  }));
+
+  it('should reset searchField when dropdown menu has been closed', () => {
+    spyOn(component.searchField, 'setValue').and.callThrough();
+    component.reset();
+
+    expect(component.searchField.setValue).toHaveBeenCalled();
+  });
+
+  it('should change loader status', () => {
+    spyOn(component.isLoadingList, 'next').and.callThrough();
+    component.hideShowLoader(true);
+
+    expect(component.isLoadingList.next).toHaveBeenCalledWith(true);
+  });
+
+  it('reset pagination fields', () => {
+    component.resetPagination();
+
+    expect(component.currentPage).toEqual(1);
+    expect(component.currentQuery).toEqual('');
+    expect(component.hasNextPage).toEqual(true);
+    expect(component.searchListCollection).toEqual([]);
+  });
+});
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
new file mode 100644
index 00000000000..d4105309725
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -0,0 +1,256 @@
+import {
+  Component,
+  OnInit,
+  HostListener,
+  ChangeDetectorRef,
+  OnDestroy,
+  Output,
+  EventEmitter,
+  ElementRef
+} from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { Observable, Subscription, BehaviorSubject } from 'rxjs';
+import { hasValue } from '../empty.util';
+import {
+  map,
+  mergeMap,
+  startWith,
+  debounceTime,
+  distinctUntilChanged,
+  switchMap,
+  reduce
+} from 'rxjs/operators';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { FindListOptions } from 'src/app/core/data/request.models';
+import { PaginatedList } from 'src/app/core/data/paginated-list.model';
+import { Community } from 'src/app/core/shared/community.model';
+import { CollectionDataService } from 'src/app/core/data/collection-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import { followLink } from '../utils/follow-link-config.model';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteWithNotEmptyData
+} from '../../core/shared/operators';
+
+/**
+ * An interface to represent a collection entry
+ */
+interface CollectionListEntryItem {
+  id: string;
+  uuid: string;
+  name: string;
+}
+
+/**
+ * An interface to represent an entry in the collection list
+ */
+export interface CollectionListEntry {
+  communities: CollectionListEntryItem[],
+  collection: CollectionListEntryItem
+}
+
+@Component({
+  selector: 'ds-collection-dropdown',
+  templateUrl: './collection-dropdown.component.html',
+  styleUrls: ['./collection-dropdown.component.scss']
+})
+export class CollectionDropdownComponent implements OnInit, OnDestroy {
+
+  /**
+   * The search form control
+   * @type {FormControl}
+   */
+  public searchField: FormControl = new FormControl();
+
+  /**
+   * The collection list obtained from a search
+   * @type {Observable<CollectionListEntry[]>}
+   */
+  public searchListCollection$: Observable<CollectionListEntry[]>;
+
+  /**
+   * A boolean representing if dropdown list is scrollable to the bottom
+   * @type {boolean}
+   */
+  private scrollableBottom = false;
+
+  /**
+   * A boolean representing if dropdown list is scrollable to the top
+   * @type {boolean}
+   */
+  private scrollableTop = false;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  public subs: Subscription[] = [];
+
+  /**
+   * The list of collection to render
+   */
+  searchListCollection: CollectionListEntry[] = [];
+
+  @Output() selectionChange = new EventEmitter<CollectionListEntry>();
+  /**
+   * A boolean representing if the loader is visible or not
+   */
+  isLoadingList: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  /**
+   * A numeric representig current page
+   */
+  currentPage: number;
+
+  /**
+   * A boolean representing if exist another page to render
+   */
+  hasNextPage: boolean;
+
+  /**
+   * Current seach query used to filter collection list
+   */
+  currentQuery: string;
+
+  constructor(
+    private changeDetectorRef: ChangeDetectorRef,
+    private collectionDataService: CollectionDataService,
+    private el: ElementRef
+  ) { }
+
+  /**
+   * Method called on mousewheel event, it prevent the page scroll
+   * when arriving at the top/bottom of dropdown menu
+   *
+   * @param event
+   *     mousewheel event
+   */
+  @HostListener('mousewheel', ['$event']) onMousewheel(event) {
+    if (event.wheelDelta > 0 && this.scrollableTop) {
+      event.preventDefault();
+    }
+    if (event.wheelDelta < 0 && this.scrollableBottom) {
+      event.preventDefault();
+    }
+  }
+
+  /**
+   * Initialize collection list
+   */
+  ngOnInit() {
+    this.subs.push(this.searchField.valueChanges.pipe(
+        debounceTime(500),
+        distinctUntilChanged(),
+        startWith('')
+      ).subscribe(
+        (next) => {
+          if (hasValue(next) && next !== this.currentQuery) {
+            this.resetPagination();
+            this.currentQuery = next;
+            this.populateCollectionList(this.currentQuery, this.currentPage);
+          }
+        }
+      ));
+    // Workaround for prevent the scroll of main page when this component is placed in a dialog
+    setTimeout(() => this.el.nativeElement.querySelector('input').focus(), 0);
+  }
+
+  /**
+   * Check if dropdown scrollbar is at the top or bottom of the dropdown list
+   *
+   * @param event
+   */
+  onScroll(event) {
+    this.scrollableBottom = (event.target.scrollTop + event.target.clientHeight === event.target.scrollHeight);
+    this.scrollableTop = (event.target.scrollTop === 0);
+  }
+
+  /**
+   * Method used from infitity scroll for retrive more data on scroll down
+   */
+  onScrollDown() {
+    if ( this.hasNextPage ) {
+      this.populateCollectionList(this.currentQuery, ++this.currentPage);
+    }
+  }
+
+  /**
+   * Emit a [selectionChange] event when a new collection is selected from list
+   *
+   * @param event
+   *    the selected [CollectionListEntry]
+   */
+  onSelect(event: CollectionListEntry) {
+    this.selectionChange.emit(event);
+  }
+
+  /**
+   * Method called for populate the collection list
+   * @param query text for filter the collection list
+   * @param page page number
+   */
+  populateCollectionList(query: string, page: number) {
+    this.isLoadingList.next(true);
+    // Set the pagination info
+    const findOptions: FindListOptions = {
+      elementsPerPage: 10,
+      currentPage: page
+    };
+    this.searchListCollection$ = this.collectionDataService
+      .getAuthorizedCollection(query, findOptions, false, followLink('parentCommunity'))
+      .pipe(
+        getFirstSucceededRemoteWithNotEmptyData(),
+        switchMap((collections: RemoteData<PaginatedList<Collection>>) => {
+          if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collections.payload.totalElements ) {
+            this.hasNextPage = false;
+          }
+          return collections.payload.page;
+        }),
+        mergeMap((collection: Collection) => collection.parentCommunity.pipe(
+          getFirstSucceededRemoteDataPayload(),
+          map((community: Community) => ({
+            communities: [{ id: community.id, name: community.name }],
+            collection: { id: collection.id, uuid: collection.id, name: collection.name }
+          })
+        ))),
+        reduce((acc: any, value: any) => [...acc, ...value], []),
+        startWith([])
+        );
+    this.subs.push(this.searchListCollection$.subscribe(
+      (next) => { this.searchListCollection.push(...next); }, undefined,
+      () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); }
+    ));
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Reset search form control
+   */
+  reset() {
+    this.searchField.setValue('');
+  }
+
+  /**
+   * Reset pagination values
+   */
+  resetPagination() {
+    this.currentPage = 1;
+    this.currentQuery = '';
+    this.hasNextPage = true;
+    this.searchListCollection = [];
+  }
+
+  /**
+   * Hide/Show the collection list loader
+   * @param hideShow true for show, false otherwise
+   */
+  hideShowLoader(hideShow: boolean) {
+    this.isLoadingList.next(hideShow);
+  }
+}
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
index 09f7e459e47..6d0a0f90bed 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
@@ -4,7 +4,7 @@
       <label>{{type.value + '.edit.logo.label' | translate}}</label>
     </div>
     <ng-container *ngVar="(dso?.logo | async)?.payload as logo">
-      <div class="col-12 d-inline-block alert" [ngClass]="{'alert-danger': markLogoForDeletion}" id="logo-section">
+      <div class="col-12 d-inline-block alert" [ngClass]="{'alert-danger': markLogoForDeletion}" id="logo-section" *ngIf="logo">
         <div class="row">
           <div class="col-8 d-inline-block">
             <ds-comcol-page-logo [logo]="logo"></ds-comcol-page-logo>
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
index a1bac46f870..8808faa4529 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
@@ -9,23 +9,21 @@ import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { AuthService } from '../../../core/auth/auth.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
-import { RemoteData } from '../../../core/data/remote-data';
-import { RequestError } from '../../../core/data/request.models';
 import { RequestService } from '../../../core/data/request.service';
 import { RestRequestMethod } from '../../../core/data/rest-request-method';
 import { Community } from '../../../core/shared/community.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { hasValue } from '../../empty.util';
 import { AuthServiceMock } from '../../mocks/auth.service.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { VarDirective } from '../../utils/var.directive';
 import { ComColFormComponent } from './comcol-form.component';
+import { Operation } from 'fast-json-patch';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
 
 describe('ComColFormComponent', () => {
-  let comp: ComColFormComponent<DSpaceObject>;
-  let fixture: ComponentFixture<ComColFormComponent<DSpaceObject>>;
+  let comp: ComColFormComponent<any>;
+  let fixture: ComponentFixture<ComColFormComponent<any>>;
   let location: Location;
   const formServiceStub: any = {
     createFormGroup: (fModel: DynamicFormControlModel[]) => {
@@ -40,11 +38,8 @@ describe('ComColFormComponent', () => {
     }
   };
   const dcTitle = 'dc.title';
-  const dcRandom = 'dc.random';
   const dcAbstract = 'dc.description.abstract';
 
-  const titleMD = { [dcTitle]: [{ value: 'Community Title', language: null }] };
-  const randomMD = { [dcRandom]: [{ value: 'Random metadata excluded from form', language: null }] };
   const abstractMD = { [dcAbstract]: [{ value: 'Community description', language: null }] };
   const newTitleMD = { [dcTitle]: [{ value: 'New Community Title', language: null }] };
   const formModel = [
@@ -63,7 +58,7 @@ describe('ComColFormComponent', () => {
   const logoEndpoint = 'rest/api/logo/endpoint';
   const dsoService = Object.assign({
     getLogoEndpoint: () => observableOf(logoEndpoint),
-    deleteLogo: () => observableOf({})
+    deleteLogo: () => createSuccessfulRemoteDataObject$({})
   });
   const notificationsService = new NotificationsServiceStub();
 
@@ -71,10 +66,10 @@ describe('ComColFormComponent', () => {
   const locationStub = jasmine.createSpyObj('location', ['back']);
   /* tslint:enable:no-empty */
 
-  const requestServiceStub = jasmine.createSpyObj({
+  const requestServiceStub = jasmine.createSpyObj('requestService', {
     removeByHrefSubstring: {}
   });
-  const objectCacheStub = jasmine.createSpyObj({
+  const objectCacheStub = jasmine.createSpyObj('objectCache', {
     remove: {}
   });
 
@@ -112,33 +107,47 @@ describe('ComColFormComponent', () => {
       });
 
       it('should emit the new version of the community', () => {
-        comp.dso = Object.assign(
-          new Community(),
-          {
-            metadata: {
-              ...titleMD,
-              ...randomMD
-            }
-          }
-        );
+        comp.dso = new Community();
         comp.onSubmit();
 
+        const operations: Operation[] = [
+          {
+            op: 'replace',
+            path: '/metadata/dc.title',
+            value: {
+              value: 'New Community Title',
+              language: null,
+            },
+          },
+          {
+            op: 'replace',
+            path: '/metadata/dc.description.abstract',
+            value: {
+              value: 'Community description',
+              language: null,
+            },
+          },
+        ];
+
         expect(comp.submitForm.emit).toHaveBeenCalledWith(
           {
-            dso: Object.assign(
-              {},
-              new Community(),
-              {
+            dso: Object.assign({}, comp.dso, {
                 metadata: {
-                  ...newTitleMD,
-                  ...randomMD,
-                  ...abstractMD
+                  'dc.title': [{
+                    value: 'New Community Title',
+                    language: null,
+                  }],
+                  'dc.description.abstract': [{
+                    value: 'Community description',
+                    language: null,
+                  }],
                 },
-                type: Community.type
-              },
+                type: Community.type,
+              }
             ),
             uploader: undefined,
-            deleteLogo: false
+            deleteLogo: false,
+            operations: operations,
           }
         );
       })
@@ -164,11 +173,6 @@ describe('ComColFormComponent', () => {
       it('should emit finish', () => {
         expect(comp.finish.emit).toHaveBeenCalled();
       });
-
-      it('should remove the object\'s cache', () => {
-        expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalled();
-        expect(objectCacheStub.remove).toHaveBeenCalled();
-      });
     });
 
     describe('onUploadError', () => {
@@ -192,7 +196,7 @@ describe('ComColFormComponent', () => {
       beforeEach(() => {
         initComponent(Object.assign(new Community(), {
           id: 'community-id',
-          logo: observableOf(new RemoteData(false, false, true, null, undefined)),
+          logo: createSuccessfulRemoteDataObject$(undefined),
           _links: { self: { href: 'community-self' } }
         }));
       });
@@ -210,8 +214,11 @@ describe('ComColFormComponent', () => {
       beforeEach(() => {
         initComponent(Object.assign(new Community(), {
           id: 'community-id',
-          logo: observableOf(new RemoteData(false, false, true, null, {})),
-          _links: { self: { href: 'community-self' } }
+          logo: createSuccessfulRemoteDataObject$({}),
+          _links: {
+            self: { href: 'community-self' },
+            logo: { href: 'community-logo' },
+          }
         }));
       });
 
@@ -229,23 +236,24 @@ describe('ComColFormComponent', () => {
         });
 
         describe('when dsoService.deleteLogo returns a successful response', () => {
-          const response = new RestResponse(true, 200, 'OK');
-
           beforeEach(() => {
-            spyOn(dsoService, 'deleteLogo').and.returnValue(observableOf(response));
+            spyOn(dsoService, 'deleteLogo').and.returnValue(createSuccessfulRemoteDataObject$({}));
             comp.onSubmit();
           });
 
           it('should display a success notification', () => {
             expect(notificationsService.success).toHaveBeenCalled();
           });
+
+          it('should remove the object\'s cache', () => {
+            expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalled();
+            expect(objectCacheStub.remove).toHaveBeenCalled();
+          });
         });
 
         describe('when dsoService.deleteLogo returns an error response', () => {
-          const response = new ErrorResponse(new RequestError('this error was purposely thrown, to test error notifications'));
-
           beforeEach(() => {
-            spyOn(dsoService, 'deleteLogo').and.returnValue(observableOf(response));
+            spyOn(dsoService, 'deleteLogo').and.returnValue(createFailedRemoteDataObject$('Error', 500));
             comp.onSubmit();
           });
 
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
index f8199d2aad4..a733ddbb6a2 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
@@ -1,7 +1,19 @@
 import { Location } from '@angular/common';
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel
+} from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import { FileUploader } from 'ng2-file-upload';
 import { combineLatest as observableCombineLatest } from 'rxjs';
@@ -9,7 +21,6 @@ import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { Subscription } from 'rxjs/internal/Subscription';
 import { AuthService } from '../../../core/auth/auth.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
 import { ComColDataService } from '../../../core/data/comcol-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
@@ -17,14 +28,15 @@ import { RestRequestMethod } from '../../../core/data/rest-request-method';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Community } from '../../../core/shared/community.model';
-
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { MetadataMap, MetadataValue } from '../../../core/shared/metadata.models';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { hasValue, isNotEmpty } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { UploaderOptions } from '../../uploader/uploader-options.model';
 import { UploaderComponent } from '../../uploader/uploader.component';
+import { Operation } from 'fast-json-patch';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 /**
  * A form for creating and editing Communities or Collections
@@ -34,7 +46,7 @@ import { UploaderComponent } from '../../uploader/uploader.component';
   styleUrls: ['./comcol-form.component.scss'],
   templateUrl: './comcol-form.component.html'
 })
-export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDestroy {
+export class ComColFormComponent<T extends Collection | Community> implements OnInit, OnDestroy {
 
   /**
    * The logo uploader component
@@ -85,7 +97,8 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
   @Output() submitForm: EventEmitter<{
     dso: T,
     uploader: FileUploader,
-    deleteLogo: boolean
+    deleteLogo: boolean,
+    operations: Operation[],
   }> = new EventEmitter();
 
   /**
@@ -140,10 +153,10 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
 
     if (hasValue(this.dso.id)) {
       this.subs.push(
-        observableCombineLatest(
+        observableCombineLatest([
           this.dsoService.getLogoEndpoint(this.dso.id),
-          (this.dso as any).logo
-        ).subscribe(([href, logoRD]: [string, RemoteData<Bitstream>]) => {
+          this.dso.logo
+        ]).subscribe(([href, logoRD]: [string, RemoteData<Bitstream>]) => {
           this.uploadFilesOptions.url = href;
           this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
           // If the object already contains a logo, send out a PUT request instead of POST for setting a new logo
@@ -165,21 +178,22 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
    * Checks which new fields were added and sends the updated version of the DSO to the parent component
    */
   onSubmit() {
-    if (this.markLogoForDeletion && hasValue(this.dso.id)) {
-      this.dsoService.deleteLogo(this.dso).subscribe((response: RestResponse) => {
-        if (response.isSuccessful) {
+    if (this.markLogoForDeletion && hasValue(this.dso.id) && hasValue(this.dso._links.logo)) {
+      this.dsoService.deleteLogo(this.dso).pipe(
+        getFirstCompletedRemoteData()
+      ).subscribe((response: RemoteData<NoContent>) => {
+        if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.title'),
             this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.content')
           );
         } else {
-          const errorResponse = response as ErrorResponse;
           this.notificationsService.error(
             this.translate.get(this.type.value + '.edit.logo.notifications.delete.error.title'),
-            errorResponse.errorMessage
+            response.errorMessage
           );
         }
-        (this.dso as any).logo = undefined;
+        this.dso.logo = undefined;
         this.uploadFilesOptions.method = RestRequestMethod.POST;
         this.refreshCache();
         this.finish.emit();
@@ -189,9 +203,9 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
     const formMetadata = {}  as MetadataMap;
     this.formModel.forEach((fieldModel: DynamicInputModel) => {
       const value: MetadataValue = {
-          value: fieldModel.value as string,
-          language: null
-        } as any;
+        value: fieldModel.value as string,
+        language: null
+      } as any;
       if (formMetadata.hasOwnProperty(fieldModel.name)) {
         formMetadata[fieldModel.name].push(value);
       } else {
@@ -206,10 +220,26 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
       },
       type: Community.type
     });
+
+    const operations: Operation[] = [];
+    this.formModel.forEach((fieldModel: DynamicInputModel) => {
+      if (fieldModel.value !== this.dso.firstMetadataValue(fieldModel.name)) {
+        operations.push({
+          op: 'replace',
+          path: `/metadata/${fieldModel.name}`,
+          value: {
+            value: fieldModel.value,
+            language: null,
+          },
+        });
+      }
+    });
+
     this.submitForm.emit({
       dso: updatedDSO,
       uploader: hasValue(this.uploaderComponent) ? this.uploaderComponent.uploader : undefined,
-      deleteLogo: this.markLogoForDeletion
+      deleteLogo: this.markLogoForDeletion,
+      operations: operations,
     });
   }
 
@@ -257,7 +287,9 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
    * The request was successful, display a success notification
    */
   public onCompleteItem() {
-    this.refreshCache();
+    if (hasValue(this.dso.id)) {
+      this.refreshCache();
+    }
     this.notificationsService.success(null, this.translate.get(this.type.value + '.edit.logo.notifications.add.success'));
     this.finish.emit();
   }
diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
index 780589d0c5d..58279341ff5 100644
--- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
@@ -9,7 +9,6 @@ import { SharedModule } from '../../shared.module';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { CreateComColPageComponent } from './create-comcol-page.component';
 import {
   createFailedRemoteDataObject$,
@@ -18,10 +17,12 @@ import {
 import { ComColDataService } from '../../../core/data/comcol-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RequestService } from '../../../core/data/request.service';
+import {getTestScheduler} from 'jasmine-marbles';
 
 describe('CreateComColPageComponent', () => {
-  let comp: CreateComColPageComponent<DSpaceObject>;
-  let fixture: ComponentFixture<CreateComColPageComponent<DSpaceObject>>;
+  let comp: CreateComColPageComponent<any>;
+  let fixture: ComponentFixture<CreateComColPageComponent<any>>;
   let communityDataService: CommunityDataService;
   let dsoDataService: CommunityDataService;
   let routeService: RouteService;
@@ -29,9 +30,12 @@ describe('CreateComColPageComponent', () => {
 
   let community;
   let newCommunity;
+  let parentCommunity;
   let communityDataServiceStub;
   let routeServiceStub;
   let routerStub;
+  let requestServiceStub;
+  let scheduler;
 
   const logoEndpoint = 'rest/api/logo/endpoint';
 
@@ -41,7 +45,18 @@ describe('CreateComColPageComponent', () => {
       metadata: [{
         key: 'dc.title',
         value: 'test community'
-      }]
+      }],
+      _links: {}
+    });
+
+    parentCommunity = Object.assign(new Community(), {
+      uuid: 'a20da287-e174-466a-9926-f66as300d399',
+      id: 'a20da287-e174-466a-9926-f66as300d399',
+      metadata: [{
+        key: 'dc.title',
+        value: 'parent community'
+      }],
+      _links: {}
     });
 
     newCommunity = Object.assign(new Community(), {
@@ -49,7 +64,8 @@ describe('CreateComColPageComponent', () => {
       metadata: [{
         key: 'dc.title',
         value: 'new community'
-      }]
+      }],
+      _links: {}
     });
 
     communityDataServiceStub = {
@@ -61,7 +77,9 @@ describe('CreateComColPageComponent', () => {
         }]
       })),
       create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
-      getLogoEndpoint: () => observableOf(logoEndpoint)
+      getLogoEndpoint: () => observableOf(logoEndpoint),
+      findByHref: () => null,
+      refreshCache: () => {return}
     };
 
     routeServiceStub = {
@@ -71,6 +89,10 @@ describe('CreateComColPageComponent', () => {
       navigate: (commands) => commands
     };
 
+    requestServiceStub = jasmine.createSpyObj('RequestService', {
+      removeByHrefSubstring: jasmine.createSpy('removeByHrefSubstring'),
+    });
+
   }
 
   beforeEach(async(() => {
@@ -82,7 +104,8 @@ describe('CreateComColPageComponent', () => {
         { provide: CommunityDataService, useValue: communityDataServiceStub },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: routerStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: RequestService, useValue: requestServiceStub}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -97,6 +120,7 @@ describe('CreateComColPageComponent', () => {
     communityDataService = (comp as any).communityDataService;
     routeService = (comp as any).routeService;
     router = (comp as any).router;
+    scheduler = getTestScheduler();
   });
 
   describe('onSubmit', () => {
@@ -111,6 +135,7 @@ describe('CreateComColPageComponent', () => {
               value: 'test'
             }]
           }),
+          _links: {},
           uploader: {
             options: {
               url: ''
@@ -123,19 +148,23 @@ describe('CreateComColPageComponent', () => {
         };
       });
 
-      it('should navigate when successful', () => {
+      it('should navigate and refresh cache when successful', () => {
         spyOn(router, 'navigate');
-        comp.onSubmit(data);
-        fixture.detectChanges();
+        spyOn((dsoDataService as any), 'refreshCache')
+        scheduler.schedule(() => comp.onSubmit(data));
+        scheduler.flush();
         expect(router.navigate).toHaveBeenCalled();
+        expect((dsoDataService as any).refreshCache).toHaveBeenCalled();
       });
 
-      it('should not navigate on failure', () => {
+      it('should neither navigate nor refresh cache on failure', () => {
         spyOn(router, 'navigate');
-        spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$(newCommunity));
-        comp.onSubmit(data);
-        fixture.detectChanges();
+        spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$('server error', 500));
+        spyOn(dsoDataService, 'refreshCache')
+        scheduler.schedule(() => comp.onSubmit(data));
+        scheduler.flush();
         expect(router.navigate).not.toHaveBeenCalled();
+        expect((dsoDataService as any).refreshCache).not.toHaveBeenCalled();
       });
     });
 
@@ -148,6 +177,7 @@ describe('CreateComColPageComponent', () => {
               value: 'test'
             }]
           }),
+          _links: {},
           uploader: {
             options: {
               url: ''
@@ -164,21 +194,21 @@ describe('CreateComColPageComponent', () => {
 
       it('should not navigate', () => {
         spyOn(router, 'navigate');
-        comp.onSubmit(data);
-        fixture.detectChanges();
+        scheduler.schedule(() => comp.onSubmit(data));
+        scheduler.flush();
         expect(router.navigate).not.toHaveBeenCalled();
       });
 
       it('should set the uploader\'s url to the logo\'s endpoint', () => {
-        comp.onSubmit(data);
-        fixture.detectChanges();
+        scheduler.schedule(() => comp.onSubmit(data));
+        scheduler.flush();
         expect(data.uploader.options.url).toEqual(logoEndpoint);
       });
 
       it('should call the uploader\'s uploadAll', () => {
         spyOn(data.uploader, 'uploadAll');
-        comp.onSubmit(data);
-        fixture.detectChanges();
+        scheduler.schedule(() => comp.onSubmit(data));
+        scheduler.flush();
         expect(data.uploader.uploadAll).toHaveBeenCalled();
       });
     });
diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
index e9373aff473..46660ca48a8 100644
--- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
@@ -2,17 +2,19 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { flatMap, take } from 'rxjs/operators';
 import { ComColDataService } from '../../../core/data/comcol-data.service';
 import { CommunityDataService } from '../../../core/data/community-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { RouteService } from '../../../core/services/route.service';
 import { Community } from '../../../core/shared/community.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { getFirstSucceededRemoteDataPayload, } from '../../../core/shared/operators';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { hasValue, isNotEmpty, isNotUndefined } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { RequestService } from '../../../core/data/request.service';
+import { Collection } from '../../../core/shared/collection.model';
 
 /**
  * Component representing the create page for communities and collections
@@ -21,7 +23,7 @@ import { NotificationsService } from '../../notifications/notifications.service'
   selector: 'ds-create-comcol',
   template: ''
 })
-export class CreateComColPageComponent<TDomain extends DSpaceObject> implements OnInit {
+export class CreateComColPageComponent<TDomain extends Collection | Community> implements OnInit {
   /**
    * Frontend endpoint for this type of DSO
    */
@@ -53,7 +55,8 @@ export class CreateComColPageComponent<TDomain extends DSpaceObject> implements
     protected routeService: RouteService,
     protected router: Router,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
+    protected requestService: RequestService
   ) {
 
   }
@@ -75,24 +78,29 @@ export class CreateComColPageComponent<TDomain extends DSpaceObject> implements
     const dso = event.dso;
     const uploader = event.uploader;
 
-    this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => {
-      this.dsoDataService.create(dso, uuid)
-        .pipe(getSucceededRemoteData())
-        .subscribe((dsoRD: RemoteData<TDomain>) => {
-          if (isNotUndefined(dsoRD)) {
-            this.newUUID = dsoRD.payload.uuid;
-            if (uploader.queue.length > 0) {
-              this.dsoDataService.getLogoEndpoint(this.newUUID).pipe(take(1)).subscribe((href: string) => {
-                uploader.options.url = href;
-                uploader.uploadAll();
-              });
-            } else {
-              this.navigateToNewPage();
-            }
-            this.notificationsService.success(null, this.translate.get(this.type.value + '.create.notifications.success'));
+    this.parentUUID$.pipe(
+      take(1),
+      flatMap((uuid: string) => {
+      const params = uuid ? [new RequestParam('parent', uuid)] : [];
+      return this.dsoDataService.create(dso, ...params)
+        .pipe(getFirstSucceededRemoteDataPayload()
+        )
+      }))
+      .subscribe((dsoRD: TDomain) => {
+        if (isNotUndefined(dsoRD)) {
+          this.newUUID = dsoRD.uuid;
+          if (uploader.queue.length > 0) {
+            this.dsoDataService.getLogoEndpoint(this.newUUID).pipe(take(1)).subscribe((href: string) => {
+              uploader.options.url = href;
+              uploader.uploadAll();
+            });
+          } else {
+            this.navigateToNewPage();
           }
-        });
-    });
+          this.dsoDataService.refreshCache(dsoRD);
+        }
+        this.notificationsService.success(null, this.translate.get(this.type.value + '.create.notifications.success'));
+      });
   }
 
   /**
@@ -103,5 +111,4 @@ export class CreateComColPageComponent<TDomain extends DSpaceObject> implements
       this.router.navigate([this.frontendURL + this.newUUID]);
     }
   }
-
 }
diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
index a3f6ac02168..4d48af48019 100644
--- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
@@ -1,30 +1,41 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommunityDataService } from '../../../core/data/community-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { Community } from '../../../core/shared/community.model';
 import { SharedModule } from '../../shared.module';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { DataService } from '../../../core/data/data.service';
 import { DeleteComColPageComponent } from './delete-comcol-page.component';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RequestService } from '../../../core/data/request.service';
+import { getTestScheduler } from 'jasmine-marbles';
+import { ComColDataService } from '../../../core/data/comcol-data.service';
+import {
+  createFailedRemoteDataObject$,
+  createNoContentRemoteDataObject$
+} from '../../remote-data.utils';
 
 describe('DeleteComColPageComponent', () => {
-  let comp: DeleteComColPageComponent<DSpaceObject>;
-  let fixture: ComponentFixture<DeleteComColPageComponent<DSpaceObject>>;
+  let comp: DeleteComColPageComponent<any>;
+  let fixture: ComponentFixture<DeleteComColPageComponent<any>>;
   let dsoDataService: CommunityDataService;
   let router: Router;
 
   let community;
   let newCommunity;
+  let parentCommunity;
   let routerStub;
   let routeStub;
   let notificationsService;
+  let translateServiceStub;
+  let requestServiceStub;
+
+  let scheduler;
+
   const validUUID = 'valid-uuid';
   const invalidUUID = 'invalid-uuid';
   const frontendURL = '/testType';
@@ -45,10 +56,21 @@ describe('DeleteComColPageComponent', () => {
       }]
     });
 
+    parentCommunity = Object.assign(new Community(), {
+      uuid: 'a20da287-e174-466a-9926-f66as300d399',
+      id: 'a20da287-e174-466a-9926-f66as300d399',
+      metadata: [{
+        key: 'dc.title',
+        value: 'parent community'
+      }]
+    });
+
     dsoDataService = jasmine.createSpyObj(
       'dsoDataService',
       {
-        delete: observableOf(true)
+        delete: createNoContentRemoteDataObject$(),
+        findByHref: jasmine.createSpy('findByHref'),
+        refreshCache: jasmine.createSpy('refreshCache')
       });
 
     routerStub = {
@@ -59,6 +81,14 @@ describe('DeleteComColPageComponent', () => {
       data: observableOf(community)
     };
 
+    requestServiceStub = jasmine.createSpyObj('RequestService', {
+      removeByHrefSubstring: jasmine.createSpy('removeByHrefSubstring')
+    });
+
+    translateServiceStub = jasmine.createSpyObj('TranslateService', {
+      instant: jasmine.createSpy('instant')
+    });
+
   }
 
   beforeEach(async(() => {
@@ -66,10 +96,12 @@ describe('DeleteComColPageComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       providers: [
-        { provide: DataService, useValue: dsoDataService },
+        { provide: ComColDataService, useValue: dsoDataService },
         { provide: Router, useValue: routerStub },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: translateServiceStub},
+        { provide: RequestService, useValue: requestServiceStub}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -82,43 +114,63 @@ describe('DeleteComColPageComponent', () => {
     notificationsService = (comp as any).notifications;
     (comp as any).frontendURL = frontendURL;
     router = (comp as any).router;
+    scheduler = getTestScheduler();
   });
 
   describe('onConfirm', () => {
     let data1;
     let data2;
     beforeEach(() => {
-      data1 = Object.assign(new Community(), {
-        uuid: validUUID,
-        metadata: [{
-          key: 'dc.title',
-          value: 'test'
-        }]
-      });
-
-      data2 = Object.assign(new Community(), {
-        uuid: invalidUUID,
-        metadata: [{
-          key: 'dc.title',
-          value: 'test'
-        }]
-      });
+      data1 = {
+        dso: Object.assign(new Community(), {
+          uuid: validUUID,
+          metadata: [{
+            key: 'dc.title',
+            value: 'test'
+          }]
+        }),
+        _links: {}
+      };
+
+      data2 = {
+        dso: Object.assign(new Community(), {
+          uuid: invalidUUID,
+          metadata: [{
+            key: 'dc.title',
+            value: 'test'
+          }]
+        }),
+        _links: {},
+        uploader: {
+          options: {
+            url: ''
+          },
+          queue: [],
+          /* tslint:disable:no-empty */
+          uploadAll: () => {}
+          /* tslint:enable:no-empty */
+        }
+      };
     });
 
     it('should show an error notification on failure', () => {
-      (dsoDataService.delete as any).and.returnValue(observableOf(false));
+      (dsoDataService.delete as any).and.returnValue(createFailedRemoteDataObject$('Error', 500));
       spyOn(router, 'navigate');
-      comp.onConfirm(data2);
+      scheduler.schedule(() => comp.onConfirm(data2));
+      scheduler.flush();
       fixture.detectChanges();
       expect(notificationsService.error).toHaveBeenCalled();
+      expect(dsoDataService.refreshCache).not.toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalled();
     });
 
     it('should show a success notification on success and navigate', () => {
       spyOn(router, 'navigate');
-      comp.onConfirm(data1);
+      scheduler.schedule(() => comp.onConfirm(data1));
+      scheduler.flush();
       fixture.detectChanges();
       expect(notificationsService.success).toHaveBeenCalled();
+      expect(dsoDataService.refreshCache).toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalled();
     });
 
diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
index f5a1a84af5d..a5708db210a 100644
--- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
@@ -3,10 +3,14 @@ import { Observable } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../core/data/remote-data';
 import { first, map } from 'rxjs/operators';
-import { DataService } from '../../../core/data/data.service';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { RequestService } from '../../../core/data/request.service';
+import { ComColDataService } from '../../../core/data/comcol-data.service';
+import { Community } from '../../../core/shared/community.model';
+import { Collection } from '../../../core/shared/collection.model';
 
 /**
  * Component representing the delete page for communities and collections
@@ -15,7 +19,7 @@ import { TranslateService } from '@ngx-translate/core';
   selector: 'ds-delete-comcol',
   template: ''
 })
-export class DeleteComColPageComponent<TDomain extends DSpaceObject> implements OnInit {
+export class DeleteComColPageComponent<TDomain extends Community | Collection> implements OnInit {
   /**
    * Frontend endpoint for this type of DSO
    */
@@ -26,11 +30,12 @@ export class DeleteComColPageComponent<TDomain extends DSpaceObject> implements
   public dsoRD$: Observable<RemoteData<TDomain>>;
 
   public constructor(
-    protected dsoDataService: DataService<TDomain>,
+    protected dsoDataService: ComColDataService<TDomain>,
     protected router: Router,
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
+    protected requestService: RequestService
   ) {
   }
 
@@ -44,11 +49,12 @@ export class DeleteComColPageComponent<TDomain extends DSpaceObject> implements
    */
   onConfirm(dso: TDomain) {
     this.dsoDataService.delete(dso.id)
-      .pipe(first())
-      .subscribe((success: boolean) => {
-        if (success) {
+      .pipe(getFirstCompletedRemoteData())
+      .subscribe((response: RemoteData<NoContent>) => {
+        if (response.hasSucceeded) {
           const successMessage = this.translate.instant((dso as any).type + '.delete.notification.success');
           this.notifications.success(successMessage)
+          this.dsoDataService.refreshCache(dso);
         } else {
           const errorMessage = this.translate.instant((dso as any).type + '.delete.notification.fail');
           this.notifications.error(errorMessage)
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
index 414d64cbffc..2696c925472 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
@@ -6,20 +6,21 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { CommunityDataService } from '../../../../core/data/community-data.service';
-import { RemoteData } from '../../../../core/data/remote-data';
 import { Community } from '../../../../core/shared/community.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { SharedModule } from '../../../shared.module';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../remote-data.utils';
 import { ComcolMetadataComponent } from './comcol-metadata.component';
 
 describe('ComColMetadataComponent', () => {
-  let comp: ComcolMetadataComponent<DSpaceObject>;
-  let fixture: ComponentFixture<ComcolMetadataComponent<DSpaceObject>>;
-  let dsoDataService: CommunityDataService;
+  let comp: ComcolMetadataComponent<any>;
+  let fixture: ComponentFixture<ComcolMetadataComponent<any>>;
+  let dsoDataService;
   let router: Router;
 
   let community;
@@ -49,6 +50,7 @@ describe('ComColMetadataComponent', () => {
 
     communityDataServiceStub = {
       update: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
+      patch: () => null,
       getLogoEndpoint: () => observableOf(logoEndpoint)
     };
 
@@ -59,7 +61,7 @@ describe('ComColMetadataComponent', () => {
     routeStub = {
       parent: {
         data: observableOf({
-          dso: new RemoteData(false, false, true, null, community)
+          dso: createSuccessfulRemoteDataObject(community)
         })
       }
     };
@@ -95,37 +97,56 @@ describe('ComColMetadataComponent', () => {
     describe('with an empty queue in the uploader', () => {
       beforeEach(() => {
         data = {
-          dso: Object.assign(new Community(), {
-            metadata: [{
-              key: 'dc.title',
-              value: 'test'
-            }]
-          }),
+          operations: [
+            {
+              op: 'replace',
+              path: '/metadata/dc.title',
+              value: {
+                value: 'test',
+                language: null,
+              },
+            },
+          ],
+          dso: new Community(),
           uploader: {
             options: {
               url: ''
             },
             queue: [],
             /* tslint:disable:no-empty */
-            uploadAll: () => {}
+            uploadAll: () => {
+            }
             /* tslint:enable:no-empty */
-          }
-        }
+          },
+          deleteLogo: false,
+        };
+        spyOn(router, 'navigate');
       });
 
-      it('should navigate when successful', () => {
-        spyOn(router, 'navigate');
-        comp.onSubmit(data);
-        fixture.detectChanges();
-        expect(router.navigate).toHaveBeenCalled();
+      describe('when successful', () => {
+
+        beforeEach(() => {
+          spyOn(dsoDataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$({}));
+        });
+
+        it('should navigate', () => {
+          comp.onSubmit(data);
+          fixture.detectChanges();
+          expect(router.navigate).toHaveBeenCalled();
+        });
       });
 
-      it('should not navigate on failure', () => {
-        spyOn(router, 'navigate');
-        spyOn(dsoDataService, 'update').and.returnValue(createFailedRemoteDataObject$(newCommunity));
-        comp.onSubmit(data);
-        fixture.detectChanges();
-        expect(router.navigate).not.toHaveBeenCalled();
+      describe('on failure', () => {
+
+        beforeEach(() => {
+          spyOn(dsoDataService, 'patch').and.returnValue(createFailedRemoteDataObject$('Error', 500));
+        });
+
+        it('should not navigate', () => {
+          comp.onSubmit(data);
+          fixture.detectChanges();
+          expect(router.navigate).not.toHaveBeenCalled();
+        });
       });
     });
 
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
index 1031fead10f..c3077d4e95e 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
@@ -4,19 +4,20 @@ import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { ActivatedRoute, Router } from '@angular/router';
 import { first, map, take } from 'rxjs/operators';
-import { getSucceededRemoteData } from '../../../../core/shared/operators';
-import { hasValue, isNotUndefined } from '../../../empty.util';
-import { DataService } from '../../../../core/data/data.service';
+import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { hasValue, isEmpty } from '../../../empty.util';
 import { ResourceType } from '../../../../core/shared/resource-type';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import { Community } from '../../../../core/shared/community.model';
+import { Collection } from '../../../../core/shared/collection.model';
 
 @Component({
   selector: 'ds-comcol-metadata',
   template: ''
 })
-export class ComcolMetadataComponent<TDomain extends DSpaceObject> implements OnInit {
+export class ComcolMetadataComponent<TDomain extends Community | Collection> implements OnInit {
   /**
    * Frontend endpoint for this type of DSO
    */
@@ -49,26 +50,33 @@ export class ComcolMetadataComponent<TDomain extends DSpaceObject> implements On
    * @param event   The event returned by the community/collection form. Contains the new dso and logo uploader
    */
   onSubmit(event) {
-    const dso = event.dso;
+
     const uploader = event.uploader;
     const deleteLogo = event.deleteLogo;
 
-    this.dsoDataService.update(dso)
-      .pipe(getSucceededRemoteData())
-      .subscribe((dsoRD: RemoteData<TDomain>) => {
-        if (isNotUndefined(dsoRD)) {
-          const newUUID = dsoRD.payload.uuid;
-          if (hasValue(uploader) && uploader.queue.length > 0) {
-            this.dsoDataService.getLogoEndpoint(newUUID).pipe(take(1)).subscribe((href: string) => {
-              uploader.options.url = href;
-              uploader.uploadAll();
-            });
-          } else if (!deleteLogo) {
-            this.router.navigate([this.frontendURL + newUUID]);
-          }
-          this.notificationsService.success(null, this.translate.get(this.type.value + '.edit.notifications.success'));
-        }
+    const newLogo = hasValue(uploader) && uploader.queue.length > 0;
+    if (newLogo) {
+      this.dsoDataService.getLogoEndpoint(event.dso.uuid).pipe(take(1)).subscribe((href: string) => {
+        uploader.options.url = href;
+        uploader.uploadAll();
       });
+    }
+
+    if (!isEmpty(event.operations)) {
+      this.dsoDataService.patch(event.dso, event.operations).pipe(getFirstCompletedRemoteData())
+        .subscribe(async (response: RemoteData<DSpaceObject>) => {
+          if (response.hasSucceeded) {
+            if (!newLogo && !deleteLogo) {
+              await this.router.navigate([this.frontendURL + event.dso.uuid]);
+            }
+            this.notificationsService.success(null, this.translate.get(`${this.type.value}.edit.notifications.success`));
+          } else if (response.statusCode === 403) {
+            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.unauthorized`));
+          } else {
+            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.error`));
+          }
+        });
+    }
   }
 
   /**
@@ -76,7 +84,7 @@ export class ComcolMetadataComponent<TDomain extends DSpaceObject> implements On
    */
   navigateToHomePage() {
     this.dsoRD$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       take(1)
     ).subscribe((dsoRD: RemoteData<TDomain>) => {
       this.router.navigate([this.frontendURL + dsoRD.payload.id]);
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 1e89e3facf4..9bfb12a381c 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -1,4 +1,4 @@
-<div class="card p-2 m-3 {{comcolRole.name}}">
+<div class="card p-2 m-3 {{(comcolRole$ | async)?.name}}">
 
   <div class="card-body d-flex flex-column"
        *ngVar="group$ | async as group">
@@ -6,35 +6,35 @@
     <div class="d-flex flex-md-row flex-column">
 
       <h5 class="w-100 ">
-        {{'comcol-role.edit.' + comcolRole.name + '.name' | translate}}
+        {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.name' | translate}}
       </h5>
 
       <div class="w-100">
         <ds-loading *ngIf="!(groupRD$ | async)"></ds-loading>
-        <div *ngIf="hasNoGroup$() | async">
+        <div *ngIf="hasNoGroup$ | async">
           {{'comcol-role.edit.no-group' | translate}}
         </div>
-        <div *ngIf="hasAnonymousGroup$() | async">
-          {{'comcol-role.edit.' + comcolRole.name + '.anonymous-group' | translate}}
+        <div *ngIf="hasAnonymousGroup$ | async">
+          {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.anonymous-group' | translate}}
         </div>
-        <a *ngIf="hasCustomGroup$() | async"
+        <a *ngIf="hasCustomGroup$ | async"
            routerLink="{{editGroupLink$ | async}}">
           {{group.name}}
         </a>
       </div>
 
       <div class="ml-md-auto pl-md-2 ml-0 pl-0 pt-2">
-        <div *ngIf="hasNoGroup$() | async"
+        <div *ngIf="hasNoGroup$ | async"
              class="btn btn-outline-dark create"
              (click)="create()">
           {{'comcol-role.edit.create' | translate}}
         </div>
-        <div *ngIf="hasAnonymousGroup$() | async"
+        <div *ngIf="hasAnonymousGroup$ | async"
              class="btn btn-outline-dark restrict"
              (click)="create()">
           {{'comcol-role.edit.restrict' | translate}}
         </div>
-        <div *ngIf="hasCustomGroup$() | async"
+        <div *ngIf="hasCustomGroup$ | async"
              class="btn btn-outline-dark delete"
              (click)="delete()">
           {{'comcol-role.edit.delete' | translate}}
@@ -44,7 +44,7 @@ <h5 class="w-100 ">
     </div>
 
     <div class="mt-2">
-      {{'comcol-role.edit.' + comcolRole.name + '.description' | translate}}
+      {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.description' | translate}}
     </div>
 
   </div>
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
index 4694c13603b..decb6e57e6e 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
@@ -4,13 +4,14 @@ import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { By } from '@angular/platform-browser';
 import { SharedModule } from '../../../shared.module';
 import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
 import { RequestService } from '../../../../core/data/request.service';
-import { ComcolRole } from './comcol-role';
 import { of as observableOf } from 'rxjs/internal/observable/of';
-import { RemoteData } from '../../../../core/data/remote-data';
 import { RouterTestingModule } from '@angular/router/testing';
-import { Collection } from '../../../../core/shared/collection.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../../remote-data.utils';
 
 describe('ComcolRoleComponent', () => {
 
@@ -23,10 +24,11 @@ describe('ComcolRoleComponent', () => {
 
   let group;
   let statusCode;
+  let comcolRole;
 
   beforeEach(() => {
 
-    requestService = {hasByHrefObservable: () => observableOf(true)};
+    requestService = { hasByHref$: () => observableOf(true) };
 
     groupService = {
       findByHref: () => undefined,
@@ -36,14 +38,13 @@ describe('ComcolRoleComponent', () => {
 
     spyOn(groupService, 'findByHref').and.callFake((link) => {
       if (link === 'test role link') {
-        return observableOf(new RemoteData(
-          false,
-          false,
-          true,
-          undefined,
-          group,
-          statusCode,
-        ));
+        if (statusCode === 204) {
+          return createSuccessfulRemoteDataObject$(null);
+        } else if (statusCode === 200) {
+          return createSuccessfulRemoteDataObject$(group);
+        } else {
+          return createFailedRemoteDataObject$('error', statusCode);
+        }
       }
     });
 
@@ -65,20 +66,11 @@ describe('ComcolRoleComponent', () => {
     comp = fixture.componentInstance;
     de = fixture.debugElement;
 
-    comp.comcolRole = new ComcolRole(
-      'test role name',
-      'test role endpoint',
-    );
-
-    comp.dso = Object.assign(
-      new Collection(), {
-        _links: {
-          'test role endpoint': {
-            href: 'test role link',
-          }
-        }
-      }
-    );
+    comcolRole = {
+      name: 'test role name',
+      href: 'test role link',
+    };
+    comp.comcolRole = comcolRole;
 
     fixture.detectChanges();
   });
@@ -88,6 +80,7 @@ describe('ComcolRoleComponent', () => {
     beforeEach(() => {
       group = null;
       statusCode = 204;
+      comp.comcolRole = comcolRole;
       fixture.detectChanges();
     });
 
@@ -119,6 +112,7 @@ describe('ComcolRoleComponent', () => {
         name: 'Anonymous'
       };
       statusCode = 200;
+      comp.comcolRole = comcolRole;
       fixture.detectChanges();
     });
 
@@ -138,7 +132,7 @@ describe('ComcolRoleComponent', () => {
       });
 
       it('should call the groupService create method', () => {
-        expect(groupService.createComcolGroup).toHaveBeenCalledWith(comp.dso, 'test role link');
+        expect(groupService.createComcolGroup).toHaveBeenCalledWith(comp.dso, 'test role name', 'test role link');
       });
     });
   });
@@ -150,6 +144,7 @@ describe('ComcolRoleComponent', () => {
         name: 'custom group name'
       };
       statusCode = 200;
+      comp.comcolRole = comcolRole;
       fixture.detectChanges();
     });
 
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
index 41cb7e7cd27..4c0e02b6cd8 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
@@ -2,14 +2,21 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Group } from '../../../../core/eperson/models/group.model';
 import { Community } from '../../../../core/shared/community.model';
 import { Observable } from 'rxjs';
-import { getGroupEditPath } from '../../../../+admin/admin-access-control/admin-access-control-routing.module';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Collection } from '../../../../core/shared/collection.model';
-import { filter, map } from 'rxjs/operators';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
-import { ComcolRole } from './comcol-role';
+import { map, switchMap } from 'rxjs/operators';
+import {
+  getFirstCompletedRemoteData,
+  getAllCompletedRemoteData
+} from '../../../../core/shared/operators';
 import { RequestService } from '../../../../core/data/request.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { HALLink } from '../../../../core/shared/hal-link.model';
+import { getGroupEditRoute } from '../../../../+admin/admin-access-control/admin-access-control-routing-paths';
+import { hasValue, hasNoValue } from '../../../empty.util';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { NoContent } from '../../../../core/shared/NoContent.model';
+import { filter } from 'rxjs/internal/operators/filter';
 
 /**
  * Component for managing a community or collection role.
@@ -25,102 +32,131 @@ export class ComcolRoleComponent implements OnInit {
    * The community or collection to manage.
    */
   @Input()
-  dso: Community|Collection;
+  dso: Community | Collection;
 
   /**
    * The role to manage
    */
-  @Input()
-  comcolRole: ComcolRole;
+  comcolRole$: BehaviorSubject<HALLink> = new BehaviorSubject(undefined);
 
-  constructor(
-    protected requestService: RequestService,
-    protected groupService: GroupDataService,
-  ) {
-  }
+  /**
+   * The group for this role, as an observable remote data.
+   */
+  groupRD$: Observable<RemoteData<Group>>
 
   /**
-   * The link to the related group.
+   * The group for this role, as an observable.
    */
-  get groupLink(): string {
-    return this.dso._links[this.comcolRole.linkName].href;
-  }
+  group$: Observable<Group>
 
   /**
-   * The group for this role, as an observable remote data.
+   * The link to the group edit page as an observable.
    */
-  get groupRD$(): Observable<RemoteData<Group>> {
-    return this.groupService.findByHref(this.groupLink).pipe(
-      filter((groupRD) => !!groupRD.statusCode),
-    );
-  }
+  editGroupLink$: Observable<string>
 
   /**
-   * The group for this role, as an observable.
+   * True if there is no group for this ComcolRole.
    */
-  get group$(): Observable<Group> {
-    return this.groupRD$.pipe(
-      getSucceededRemoteData(),
-      filter((groupRD) => groupRD != null),
-      getRemoteDataPayload(),
-    );
-  }
+  hasNoGroup$: Observable<boolean>
 
   /**
-   * The link to the group edit page as an observable.
+   * Return true if the group for this ComcolRole is the Anonymous group, as an observable.
    */
-  get editGroupLink$(): Observable<string> {
-    return this.group$.pipe(
-      map((group) => getGroupEditPath(group.id)),
-    );
-  }
+  hasAnonymousGroup$: Observable<boolean>
 
   /**
-   * Return true if there is no group for this ComcolRole, as an observable.
+   * Return true if there is a group for this ComcolRole other than the Anonymous group, as an observable.
    */
-  hasNoGroup$(): Observable<boolean> {
-    return this.groupRD$.pipe(
-      map((groupRD) => groupRD.statusCode === 204),
-    )
+  hasCustomGroup$: Observable<boolean>
+
+  constructor(
+    protected requestService: RequestService,
+    protected groupService: GroupDataService,
+  ) {
   }
 
   /**
-   * Return true if the group for this ComcolRole is the Anonymous group, as an observable.
+   * The link to the related group.
    */
-  hasAnonymousGroup$(): Observable<boolean> {
-    return this.group$.pipe(
-      map((group) => group.name === 'Anonymous'),
-    )
+  get groupLink(): string {
+    return this.comcolRole.href;
   }
 
   /**
-   * Return true if there is a group for this ComcolRole other than the Anonymous group, as an observable.
+   * The role to manage
    */
-  hasCustomGroup$(): Observable<boolean> {
-    return this.hasAnonymousGroup$().pipe(
-      map((anonymous) => !anonymous),
-    )
+  @Input()
+  set comcolRole(newRole: HALLink) {
+    this.comcolRole$.next(newRole);
+  }
+
+  get comcolRole(): HALLink {
+    return this.comcolRole$.getValue();
   }
 
   /**
    * Create a group for this community or collection role.
    */
   create() {
-    this.groupService.createComcolGroup(this.dso, this.groupLink).subscribe();
+    this.groupService.createComcolGroup(this.dso, this.comcolRole.name, this.groupLink).pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((rd: RemoteData<Group>) => {
+      if (rd.hasSucceeded) {
+        this.groupService.clearGroupsRequests();
+        this.requestService.setStaleByHrefSubstring(this.comcolRole.href);
+      } else {
+        // TODO show error notification
+      }
+    });
   }
 
   /**
    * Delete the group for this community or collection role.
    */
   delete() {
-    this.groupService.deleteComcolGroup(this.groupLink).subscribe();
+    this.groupService.deleteComcolGroup(this.groupLink).pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((rd: RemoteData<NoContent>) => {
+      if (rd.hasSucceeded) {
+        this.groupService.clearGroupsRequests();
+        this.requestService.setStaleByHrefSubstring(this.comcolRole.href);
+      } else {
+        // TODO show error notification
+      }
+    });
   }
 
   ngOnInit(): void {
-    this.requestService.hasByHrefObservable(this.groupLink)
-      .pipe(
-        filter((hasByHrefObservable) => !hasByHrefObservable),
-      )
-      .subscribe(() => this.groupRD$.subscribe());
+    this.groupRD$ = this.comcolRole$.pipe(
+      filter((role: HALLink) => hasValue(role)),
+      switchMap((role: HALLink) => this.groupService.findByHref(role.href)),
+      getAllCompletedRemoteData(),
+    )
+
+    this.group$ = this.groupRD$.pipe(
+      map((rd: RemoteData<Group>) => {
+        if (hasValue(rd.payload)) {
+          return rd.payload
+        } else {
+          return undefined;
+        }
+      })
+    );
+
+    this.editGroupLink$ = this.group$.pipe(
+      map((group: Group) => hasValue(group) ? getGroupEditRoute(group.id) : undefined),
+    );
+
+    this.hasNoGroup$ = this.group$.pipe(
+      map((group: Group) => hasNoValue(group)),
+    );
+
+    this.hasAnonymousGroup$ = this.group$.pipe(
+      map((group: Group) => hasValue(group) && group.name === 'Anonymous'),
+    );
+
+    this.hasCustomGroup$ = this.group$.pipe(
+      map((group: Group) => hasValue(group) && group.name !== 'Anonymous'),
+    )
   }
 }
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.ts
deleted file mode 100644
index 2ac74fe67b8..00000000000
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Community } from '../../../../core/shared/community.model';
-import { Collection } from '../../../../core/shared/collection.model';
-
-/**
- * Class representing a community or collection role.
- */
-export class ComcolRole {
-
-  /**
-   * The community admin role.
-   */
-  public static COMMUNITY_ADMIN = new ComcolRole(
-    'community-admin',
-    'adminGroup',
-  );
-
-  /**
-   * The collection admin role.
-   */
-  public static COLLECTION_ADMIN = new ComcolRole(
-    'collection-admin',
-    'adminGroup',
-  );
-
-  /**
-   * The submitters role.
-   */
-  public static SUBMITTERS = new ComcolRole(
-    'submitters',
-    'submittersGroup',
-  );
-
-  /**
-   * The default item read role.
-   */
-  public static ITEM_READ = new ComcolRole(
-    'item_read',
-    'itemReadGroup',
-  );
-
-  /**
-   * The default bitstream read role.
-   */
-  public static BITSTREAM_READ = new ComcolRole(
-    'bitstream_read',
-    'bitstreamReadGroup',
-  );
-
-  /**
-   * @param name      The name for this community or collection role.
-   * @param linkName  The path linking to this community or collection role.
-   */
-  constructor(
-    public name,
-    public linkName,
-  ) {
-  }
-
-  /**
-   * Get the REST endpoint for managing this role for a given community or collection.
-   * @param dso
-   */
-  public getEndpoint(dso: Community | Collection) {
-
-    let linkPath;
-    switch (dso.type + '') {
-      case 'community':
-        linkPath = 'communities';
-        break;
-      case 'collection':
-        linkPath = 'collections';
-        break;
-    }
-
-    return `${linkPath}/${dso.uuid}/${this.linkName}`;
-  }
-}
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index aa6290ea9ff..ad270aab808 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -16,7 +16,9 @@ <h2 class="border-bottom">{{ type + '.edit.head' | translate }}</h2>
           <div class="mb-4">
             <router-outlet></router-outlet>
           </div>
-          <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">{{ type + '.edit.return' | translate }}</a>
+          <div class="col-12">
+            <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">{{ type + '.edit.return' | translate }}</a>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 477af5c1e49..0dab8a796f5 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,11 +1,11 @@
 import { Component, Inject, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { map } from 'rxjs/operators';
-import { getCollectionPageRoute } from '../../+collection-page/collection-page-routing.module';
-import { getCommunityPageRoute } from '../../+community-page/community-page-routing.module';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface';
 import { environment } from '../../../environments/environment';
+import { getCommunityPageRoute } from '../../+community-page/community-page-routing-paths';
+import { getCollectionPageRoute } from '../../+collection-page/collection-page-routing-paths';
 
 export interface ComColPageNavOption {
   id: string;
diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.spec.ts b/src/app/shared/comcol-page-handle/comcol-page-handle.component.spec.ts
new file mode 100644
index 00000000000..e3e0c659201
--- /dev/null
+++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.spec.ts
@@ -0,0 +1,48 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { ComcolPageHandleComponent } from './comcol-page-handle.component';
+
+const handle = 'http://localhost:4000/handle/123456789/2';
+
+describe('ComcolPageHandleComponent', () => {
+  let component: ComcolPageHandleComponent;
+  let fixture: ComponentFixture<ComcolPageHandleComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ ComcolPageHandleComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ComcolPageHandleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should be empty if no content is passed', () => {
+    component.content = undefined;
+    fixture.detectChanges();
+    const div = fixture.debugElement.query(By.css('div'));
+    expect(div).toBeNull();
+  });
+
+  it('should create a link pointing the handle when present', () => {
+
+    component.content = handle;
+    fixture.detectChanges();
+
+    const link = fixture.debugElement.query(By.css('a'));
+    expect(link.nativeElement.getAttribute('href')).toBe(handle);
+    expect(link.nativeElement.innerHTML).toBe(handle);
+
+  });
+
+});
diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts
index bf403e9e88c..2ce49ebea2b 100644
--- a/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,5 +1,4 @@
 import { Component, Injectable, Input } from '@angular/core';
-import { UIURLCombiner } from '../../core/url-combiner/ui-url-combiner';
 
 /**
  * This component builds a URL from the value of "handle"
@@ -21,6 +20,6 @@ export class ComcolPageHandleComponent {
   @Input() content: string;
 
   public getHandle(): string {
-    return new UIURLCombiner('/handle/', this.content).toString();
+    return this.content;
   }
 }
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.html b/src/app/shared/confirmation-modal/confirmation-modal.component.html
new file mode 100644
index 00000000000..bb67213ed39
--- /dev/null
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -0,0 +1,16 @@
+<div>
+  <div class="modal-header">{{ headerLabel | translate:{dsoName: dso?.name} }}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <p>{{ infoLabel | translate:{dsoName: dso?.name} }}</p>
+    <button type="button" class="cancel btn btn-secondary" (click)="cancelPressed()" aria-label="Cancel">
+      {{ cancelLabel | translate:{dsoName: dso?.name} }}
+    </button>
+    <button type="button" class="confirm btn btn-primary" (click)="confirmPressed()" aria-label="Confirm" ngbAutofocus>
+      {{ confirmLabel | translate:{dsoName: dso?.name} }}
+    </button>
+  </div>
+</div>
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
new file mode 100644
index 00000000000..2aec37e31ae
--- /dev/null
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -0,0 +1,126 @@
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { ConfirmationModalComponent } from './confirmation-modal.component';
+
+describe('ConfirmationModalComponent', () => {
+  let component: ConfirmationModalComponent;
+  let fixture: ComponentFixture<ConfirmationModalComponent>;
+  let debugElement: DebugElement;
+
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ConfirmationModalComponent],
+      providers: [
+        { provide: NgbActiveModal, useValue: modalStub }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConfirmationModalComponent);
+    component = fixture.componentInstance;
+    debugElement = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('close', () => {
+    beforeEach(() => {
+      component.close();
+    });
+    it('should call the close method on the active modal', () => {
+      expect(modalStub.close).toHaveBeenCalled();
+    });
+  });
+
+  describe('confirmPressed', () => {
+    beforeEach(() => {
+      spyOn(component.response, 'next');
+      component.confirmPressed();
+    });
+    it('should call the close method on the active modal', () => {
+      expect(modalStub.close).toHaveBeenCalled();
+    });
+    it('behaviour subject should have true as next', () => {
+      expect(component.response.next).toHaveBeenCalledWith(true);
+    });
+  });
+
+  describe('cancelPressed', () => {
+    beforeEach(() => {
+      spyOn(component.response, 'next');
+      component.cancelPressed();
+    });
+    it('should call the close method on the active modal', () => {
+      expect(modalStub.close).toHaveBeenCalled();
+    });
+    it('behaviour subject should have false as next', () => {
+      expect(component.response.next).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('when the click method emits on close button', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'close');
+      debugElement.query(By.css('button.close')).triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('should call the close method on the component', () => {
+      expect(component.close).toHaveBeenCalled();
+    });
+  });
+
+  describe('when the click method emits on cancel button', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'close');
+      spyOn(component.response, 'next');
+      debugElement.query(By.css('button.cancel')).triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('should call the close method on the component', () => {
+      expect(component.close).toHaveBeenCalled();
+    });
+    it('behaviour subject should have false as next', () => {
+      expect(component.response.next).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('when the click method emits on confirm button', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'close');
+      spyOn(component.response, 'next');
+      debugElement.query(By.css('button.confirm')).triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('should call the close method on the component', () => {
+      expect(component.close).toHaveBeenCalled();
+    });
+    it('behaviour subject should have true as next', () => {
+      expect(component.response.next).toHaveBeenCalledWith(true);
+    });
+  });
+
+});
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
new file mode 100644
index 00000000000..3cf5ffac1f9
--- /dev/null
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -0,0 +1,48 @@
+import { Component, Input, Output } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { Subject } from 'rxjs/internal/Subject';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+
+@Component({
+  selector: 'ds-confirmation-modal',
+  templateUrl: 'confirmation-modal.component.html',
+})
+export class ConfirmationModalComponent {
+  @Input() headerLabel: string;
+  @Input() infoLabel: string;
+  @Input() cancelLabel: string;
+  @Input() confirmLabel: string;
+  @Input() dso: DSpaceObject;
+
+  /**
+   * An event fired when the cancel or confirm button is clicked, with respectively false or true
+   */
+  @Output()
+  response: Subject<boolean> = new Subject();
+
+  constructor(protected activeModal: NgbActiveModal) {
+  }
+
+  /**
+   * Confirm the action that led to the modal
+   */
+  confirmPressed() {
+    this.response.next(true);
+    this.close();
+  }
+
+  /**
+   * Cancel the action that led to the modal and close modal
+   */
+  cancelPressed() {
+    this.response.next(false);
+    this.close();
+  }
+
+  /**
+   * Close the modal
+   */
+  close() {
+    this.activeModal.close();
+  }
+}
diff --git a/src/app/shared/cookies/browser-klaro.service.spec.ts b/src/app/shared/cookies/browser-klaro.service.spec.ts
new file mode 100644
index 00000000000..2654dd65c7d
--- /dev/null
+++ b/src/app/shared/cookies/browser-klaro.service.spec.ts
@@ -0,0 +1,237 @@
+import { TestBed } from '@angular/core/testing';
+
+import { BrowserKlaroService, COOKIE_MDFIELD } from './browser-klaro.service';
+import { getMockTranslateService } from '../mocks/translate.service.mock';
+import { of as observableOf } from 'rxjs'
+import { RestResponse } from '../../core/cache/response.models';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { TranslateService } from '@ngx-translate/core';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { CookieService } from '../../core/services/cookie.service';
+import { getTestScheduler } from 'jasmine-marbles';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { cloneDeep } from 'lodash';
+
+describe('BrowserKlaroService', () => {
+  let translateService;
+  let ePersonService;
+  let authService;
+  let cookieService;
+
+  let user;
+  let service: BrowserKlaroService;
+
+  let mockConfig;
+  let appName;
+  let purpose;
+  let testKey;
+
+  beforeEach(() => {
+    user = new EPerson();
+
+    translateService = getMockTranslateService();
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      createPatchFromCache: observableOf([]),
+      patch: observableOf(new RestResponse(true, 200, 'Ok'))
+    });
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      getAuthenticatedUserFromStore: observableOf(user)
+    });
+    cookieService = jasmine.createSpyObj('cookieService', {
+      get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22klaro%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
+      set: () => {
+        /* empty */
+      }
+    });
+
+    TestBed.configureTestingModule({
+      providers: [
+        BrowserKlaroService,
+        {
+          provide: TranslateService,
+          useValue: translateService
+        },
+        {
+          provide: EPersonDataService,
+          useValue: ePersonService,
+        },
+        {
+          provide: AuthService,
+          useValue: authService
+        },
+        {
+          provide: CookieService,
+          useValue: cookieService
+        }
+      ]
+    });
+    service = TestBed.get(BrowserKlaroService);
+    appName = 'testName';
+    purpose = 'test purpose';
+    testKey = 'this.is.a.fake.message.key';
+
+    mockConfig = {
+      translations: {
+        en: {
+          purposes: {},
+          test: {
+            testeritis: testKey
+          }
+        }
+      },
+      apps: [{
+        name: appName,
+        purposes: [purpose]
+      }],
+
+    };
+
+    service.klaroConfig = mockConfig;
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('initialize with user', () => {
+    beforeEach(() => {
+      spyOn((service as any), 'getUser$').and.returnValue(observableOf(user));
+      translateService.get.and.returnValue(observableOf('loading...'));
+      spyOn(service, 'addAppMessages');
+      spyOn((service as any), 'initializeUser');
+      spyOn(service, 'translateConfiguration');
+    });
+    it('to call the initialize user method and other methods', () => {
+      service.initialize();
+      expect((service as any).initializeUser).toHaveBeenCalledWith(user);
+      expect(service.addAppMessages).toHaveBeenCalled();
+      expect(service.translateConfiguration).toHaveBeenCalled();
+    });
+  });
+
+  describe('to not call the initialize user method, but the other methods', () => {
+    beforeEach(() => {
+      spyOn((service as any), 'getUser$').and.returnValue(observableOf(undefined));
+      translateService.get.and.returnValue(observableOf('loading...'));
+      spyOn(service, 'addAppMessages');
+      spyOn((service as any), 'initializeUser');
+      spyOn(service, 'translateConfiguration');
+    });
+    it('to call all ', () => {
+      service.initialize();
+      expect((service as any).initializeUser).not.toHaveBeenCalledWith(user);
+      expect(service.addAppMessages).toHaveBeenCalled();
+      expect(service.translateConfiguration).toHaveBeenCalled();
+    });
+  });
+
+  it('addAppMessages', () => {
+    service.addAppMessages();
+    expect(mockConfig.translations.en[appName]).toBeDefined();
+    expect(mockConfig.translations.en.purposes[purpose]).toBeDefined();
+  });
+
+  it('translateConfiguration', () => {
+    service.translateConfiguration();
+    expect((service as any).translateService.instant).toHaveBeenCalledWith(testKey);
+  });
+
+  describe('initializeUser when there is a metadata field value', () => {
+    beforeEach(() => {
+      user.setMetadata(COOKIE_MDFIELD, undefined, '{}');
+      spyOn(service, 'restoreSettingsForUsers');
+    });
+
+    it('initializeUser', () => {
+      (service as any).initializeUser(user);
+      expect(service.restoreSettingsForUsers).toHaveBeenCalledWith(user);
+    });
+  });
+
+  describe('initializeUser when there is no metadata field value but there is an anonymous cookie', () => {
+    const cookie = '{test: \'testt\'}';
+    beforeEach(() => {
+      (service as any).cookieService.get.and.returnValue(cookie);
+      spyOn(service, 'updateSettingsForUsers');
+    });
+
+    it('initializeUser', () => {
+      (service as any).initializeUser(user);
+      expect((service as any).cookieService.set).toHaveBeenCalledWith(service.getStorageName(user.uuid), cookie)
+      expect(service.updateSettingsForUsers).toHaveBeenCalledWith(user);
+    });
+  });
+
+  describe('getUser$ when there is no one authenticated', () => {
+    beforeEach(() => {
+      (service as any).authService.isAuthenticated.and.returnValue(observableOf(false));
+    });
+    it('should return undefined', () => {
+      getTestScheduler().expectObservable((service as any).getUser$()).toBe('(a|)', { a: undefined });
+    });
+  });
+
+  describe('getUser$ when there someone is authenticated', () => {
+    beforeEach(() => {
+      (service as any).authService.isAuthenticated.and.returnValue(observableOf(true));
+      (service as any).authService.getAuthenticatedUserFromStore.and.returnValue(observableOf(user));
+    });
+    it('should return the user', () => {
+      getTestScheduler().expectObservable((service as any).getUser$()).toBe('(a|)', { a: user });
+    });
+  });
+
+  describe('getSettingsForUser', () => {
+    const cookieConsentString = '{test: \'testt\'}';
+    beforeEach(() => {
+      user.metadata = {};
+      user.metadata[COOKIE_MDFIELD] = [Object.assign(new MetadataValue(), { value: cookieConsentString })];
+      spyOn(JSON, 'parse');
+    });
+    it('should return the cookie consents object', () => {
+      service.getSettingsForUser(user);
+      expect(JSON.parse).toHaveBeenCalledWith(cookieConsentString);
+    });
+  });
+
+  describe('setSettingsForUser when there are changes', () => {
+    const cookieConsent = { test: 'testt' };
+    const cookieConsentString = '{test: \'testt\'}';
+    const operation = { op: 'add', path: 'metadata/dc.agreements.cookie', value: cookieConsentString };
+    let updatedUser;
+
+    beforeEach(() => {
+      updatedUser = cloneDeep(user);
+
+      spyOn(updatedUser, 'setMetadata');
+      spyOn(JSON, 'stringify').and.returnValue(cookieConsentString);
+      ePersonService.createPatchFromCache.and.returnValue(observableOf([operation]))
+    });
+    it('should call patch on the data service', () => {
+      service.setSettingsForUser(updatedUser, cookieConsent);
+      expect(updatedUser.setMetadata).toHaveBeenCalledWith(COOKIE_MDFIELD, undefined, cookieConsentString);
+      expect(ePersonService.patch).toHaveBeenCalledWith(updatedUser, [operation])
+    });
+  });
+
+  describe('setSettingsForUser when there are no changes', () => {
+    const cookieConsent = { test: 'testt' };
+    const cookieConsentString = '{test: \'testt\'}';
+    let updatedUser;
+
+    beforeEach(() => {
+      updatedUser = cloneDeep(user);
+
+      spyOn(updatedUser, 'setMetadata');
+      spyOn(JSON, 'stringify').and.returnValue(cookieConsentString);
+      ePersonService.createPatchFromCache.and.returnValue(observableOf([]))
+    });
+    it('should not call patch on the data service', () => {
+      service.setSettingsForUser(updatedUser, cookieConsent);
+      expect(updatedUser.setMetadata).toHaveBeenCalledWith(COOKIE_MDFIELD, undefined, cookieConsentString);
+      expect(ePersonService.patch).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
new file mode 100644
index 00000000000..b3488105f4c
--- /dev/null
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -0,0 +1,257 @@
+import { Injectable } from '@angular/core';
+import * as Klaro from 'klaro'
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { TranslateService } from '@ngx-translate/core';
+import { environment } from '../../../environments/environment';
+import { switchMap, take } from 'rxjs/operators';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { KlaroService } from './klaro.service';
+import { hasValue, isNotEmpty } from '../empty.util';
+import { CookieService } from '../../core/services/cookie.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { cloneDeep, debounce } from 'lodash';
+import { ANONYMOUS_STORAGE_NAME_KLARO, klaroConfiguration } from './klaro-configuration';
+import { Operation } from 'fast-json-patch';
+
+/**
+ * Metadata field to store a user's cookie consent preferences in
+ */
+export const COOKIE_MDFIELD = 'dspace.agreements.cookies';
+
+/**
+ * Prefix key for app title messages
+ */
+const cookieNameMessagePrefix = 'cookies.consent.app.title.';
+
+/**
+ * Prefix key for app description messages
+ */
+const cookieDescriptionMessagePrefix = 'cookies.consent.app.description.';
+
+/**
+ * Prefix key for app purpose messages
+ */
+const cookiePurposeMessagePrefix = 'cookies.consent.purpose.';
+
+/**
+ * Update request debounce in ms
+ */
+const updateDebounce = 300;
+/**
+ * Browser implementation for the KlaroService, representing a service for handling Klaro consent preferences and UI
+ */
+@Injectable()
+export class BrowserKlaroService extends KlaroService {
+  /**
+   * Initial Klaro configuration
+   */
+  klaroConfig = klaroConfiguration;
+
+  constructor(
+    private translateService: TranslateService,
+    private authService: AuthService,
+    private ePersonService: EPersonDataService,
+    private cookieService: CookieService) {
+    super();
+  }
+  /**
+   * Initializes the service:
+   *  - Retrieves the current authenticated user
+   *  - Checks if the translation service is ready
+   *  - Initialize configuration for users
+   *  - Add and translate klaro configuration messages
+   */
+  initialize() {
+    this.translateService.setDefaultLang(environment.defaultLanguage);
+
+    const user$: Observable<EPerson> = this.getUser$();
+
+    const translationServiceReady$ = this.translateService.get('loading.default').pipe(take(1));
+
+    observableCombineLatest(user$, translationServiceReady$)
+      .subscribe(([user, translation]: [EPerson, string]) => {
+        user = cloneDeep(user);
+
+        if (hasValue(user)) {
+          this.initializeUser(user);
+        }
+
+        /**
+         * Add all message keys for apps and purposes
+         */
+        this.addAppMessages();
+
+        /**
+         * Subscribe on a message to make sure the translation service is ready
+         * Translate all keys in the translation section of the configuration
+         * Show the configuration if the configuration has not been confirmed
+         */
+        this.translateConfiguration();
+        Klaro.renderKlaro(this.klaroConfig, false);
+        Klaro.initialize();
+      });
+
+  }
+
+  /**
+   * Initialize configuration for the logged in user
+   * @param user The authenticated user
+   */
+  private initializeUser(user: EPerson) {
+    this.klaroConfig.callback = debounce((consent, app) => this.updateSettingsForUsers(user), updateDebounce);
+    this.klaroConfig.storageName = this.getStorageName(user.uuid);
+
+    const anonCookie = this.cookieService.get(ANONYMOUS_STORAGE_NAME_KLARO);
+    if (hasValue(this.getSettingsForUser(user))) {
+      this.restoreSettingsForUsers(user);
+    } else if (hasValue(anonCookie)) {
+      this.cookieService.set(this.getStorageName(user.uuid), anonCookie);
+      this.updateSettingsForUsers(user);
+    }
+  }
+
+  /**
+   * Retrieves the currently logged in user
+   * Returns undefined when no one is logged in
+   */
+  private getUser$() {
+    return this.authService.isAuthenticated()
+      .pipe(
+        take(1),
+        switchMap((loggedIn: boolean) => {
+          if (loggedIn) {
+            return this.authService.getAuthenticatedUserFromStore();
+          }
+          return observableOf(undefined);
+        }),
+        take(1)
+      );
+  }
+
+  /**
+   * Create a title translation key
+   * @param title
+   */
+  private getTitleTranslation(title: string) {
+    return cookieNameMessagePrefix + title;
+  }
+
+  /**
+   * Create a description translation key
+   * @param description
+   */
+  private getDescriptionTranslation(description: string) {
+    return cookieDescriptionMessagePrefix + description;
+  }
+
+  /**
+   * Create a purpose translation key
+   * @param purpose
+   */
+  private getPurposeTranslation(purpose: string) {
+    return cookiePurposeMessagePrefix + purpose;
+  }
+
+  /**
+   * Show the cookie consent form
+   */
+  showSettings() {
+    Klaro.show(this.klaroConfig);
+  }
+
+  /**
+   * Add message keys for all apps and purposes
+   */
+  addAppMessages() {
+    this.klaroConfig.apps.forEach((app) => {
+      this.klaroConfig.translations.en[app.name] = { title: this.getTitleTranslation(app.name), description: this.getDescriptionTranslation(app.name) };
+      app.purposes.forEach((purpose) => {
+        this.klaroConfig.translations.en.purposes[purpose] = this.getPurposeTranslation(purpose);
+      })
+    });
+  }
+
+  /**
+   * Translate the translation section from the Klaro configuration
+   */
+  translateConfiguration() {
+    /**
+     * Make sure the fallback language is english
+     */
+    this.translateService.setDefaultLang(environment.defaultLanguage);
+
+    this.translate(this.klaroConfig.translations.en);
+  }
+
+  /**
+   * Translate string values in an object
+   * @param object The object containing translation keys
+   */
+  private translate(object) {
+    if (typeof (object) === 'string') {
+      return this.translateService.instant(object);
+    }
+    Object.entries(object).forEach(([key, value]: [string, any]) => {
+      object[key] = this.translate(value);
+    });
+    return object;
+  }
+
+  /**
+   * Retrieves the stored Klaro consent settings for a user
+   * @param user The user to resolve the consent for
+   */
+  getSettingsForUser(user: EPerson) {
+    const mdValue = user.firstMetadataValue(COOKIE_MDFIELD);
+    return hasValue(mdValue) ? JSON.parse(mdValue) : undefined;
+  }
+
+  /**
+   * Stores the Klaro consent settings for a user in a metadata field
+   * @param user The user to save the settings for
+   * @param config The consent settings for the user to save
+   */
+  setSettingsForUser(user: EPerson, config: object) {
+    if (isNotEmpty(config)) {
+      user.setMetadata(COOKIE_MDFIELD, undefined, JSON.stringify(config));
+    } else {
+      user.removeMetadata(COOKIE_MDFIELD);
+    }
+    this.ePersonService.createPatchFromCache(user)
+      .pipe(
+        take(1),
+        switchMap((operations: Operation[]) => {
+            if (isNotEmpty(operations)) {
+              return this.ePersonService.patch(user, operations)
+            }
+            return observableOf(undefined)
+          }
+        )
+      ).subscribe();
+  }
+
+  /**
+   * Restores the users consent settings cookie based on the user's stored consent settings
+   * @param user The user to save the settings for
+   */
+  restoreSettingsForUsers(user: EPerson) {
+    this.cookieService.set(this.getStorageName(user.uuid), this.getSettingsForUser(user));
+  }
+
+  /**
+   * Stores the consent settings for a user based on the current cookie for this user
+   * @param user
+   */
+  updateSettingsForUsers(user: EPerson) {
+    this.setSettingsForUser(user, this.cookieService.get(this.getStorageName(user.uuid)))
+  }
+
+  /**
+   * Create the storage name for klaro cookies based on the user's identifier
+   * @param identifier The user's uuid
+   */
+  getStorageName(identifier: string) {
+    return 'klaro-' + identifier
+  }
+}
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
new file mode 100644
index 00000000000..f57146c6743
--- /dev/null
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -0,0 +1,159 @@
+import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
+import { IMPERSONATING_COOKIE, REDIRECT_COOKIE } from '../../core/auth/auth.service';
+import { LANG_COOKIE } from '../../core/locale/locale.service';
+
+/**
+ * Cookie for has_agreed_end_user
+ */
+export const HAS_AGREED_END_USER = 'dsHasAgreedEndUser';
+
+/**
+ * Storage name used to store klaro cookie
+ */
+export const ANONYMOUS_STORAGE_NAME_KLARO = 'klaro-anonymous';
+
+/**
+ * Klaro configuration
+ * For more information see https://kiprotect.com/docs/klaro/annotated-config
+ */
+export const klaroConfiguration: any = {
+  storageName: ANONYMOUS_STORAGE_NAME_KLARO,
+
+  privacyPolicy: '/info/privacy',
+
+  /*
+  Setting 'hideLearnMore' to 'true' will hide the "learn more / customize" link in
+  the consent notice. We strongly advise against using this under most
+  circumstances, as it keeps the user from customizing his/her consent choices.
+  */
+  hideLearnMore: false,
+
+  /*
+  Setting 'acceptAll' to 'true' will show an "accept all" button in the notice and
+  modal, which will enable all third-party apps if the user clicks on it. If set
+  to 'false', there will be an "accept" button that will only enable the apps that
+  are enabled in the consent modal.
+  */
+  acceptAll: true,
+
+  /*
+  You can also set a custom expiration time for the Klaro cookie. By default, it
+  will expire after 30 days. Only relevant if 'storageMethod' is set to 'cookie'.
+  */
+  cookieExpiresAfterDays: 365,
+
+  htmlTexts: true,
+
+  /*
+  You can overwrite existing translations and add translations for your app
+  descriptions and purposes. See `src/translations/` for a full list of
+  translations that can be overwritten:
+  https://github.com/KIProtect/klaro/tree/master/src/translations
+  */
+  translations: {
+    en: {
+      acceptAll: 'cookies.consent.accept-all',
+      acceptSelected: 'cookies.consent.accept-selected',
+      app: {
+        optOut: {
+          description: 'cookies.consent.app.opt-out.description',
+          title: 'cookies.consent.app.opt-out.title'
+        },
+        purpose: 'cookies.consent.app.purpose',
+        purposes: 'cookies.consent.app.purposes',
+        required: {
+          description: 'cookies.consent.app.required.description',
+          title: 'cookies.consent.app.required.title'
+        }
+      },
+      close: 'cookies.consent.close',
+      decline: 'cookies.consent.decline',
+      changeDescription: 'cookies.consent.update',
+      consentNotice: {
+        description: 'cookies.consent.content-notice.description',
+        learnMore: 'cookies.consent.content-notice.learnMore'
+      },
+      consentModal: {
+        description: 'cookies.consent.content-modal.description',
+        privacyPolicy: {
+          name: 'cookies.consent.content-modal.privacy-policy.name',
+          text: 'cookies.consent.content-modal.privacy-policy.text'
+        },
+        title: 'cookies.consent.content-modal.title'
+      },
+      purposes: {}
+    }
+  },
+  apps: [
+    {
+      name: 'authentication',
+      purposes: ['functional'],
+      required: true,
+      cookies: [
+        TOKENITEM,
+        IMPERSONATING_COOKIE,
+        REDIRECT_COOKIE
+      ]
+    },
+    {
+      name: 'preferences',
+      purposes: ['functional'],
+      required: true,
+      cookies: [
+        LANG_COOKIE
+      ]
+    },
+    {
+      name: 'acknowledgement',
+      purposes: ['functional'],
+      required: true,
+      cookies: [
+        [/^klaro-.+$/],
+        HAS_AGREED_END_USER
+      ]
+    },
+    {
+      name: 'google-analytics',
+      purposes: ['statistical'],
+      required: false,
+      cookies: [
+        //     /*
+        //     you an either only provide a cookie name or regular expression (regex) or a list
+        //     consisting of a name or regex, a path and a cookie domain. Providing a path and
+        //     domain is necessary if you have apps that set cookies for a path that is not
+        //     "/", or a domain that is not the current domain. If you do not set these values
+        //     properly, the cookie can't be deleted by Klaro, as there is no way to access the
+        //     path or domain of a cookie in JS. Notice that it is not possible to delete
+        //     cookies that were set on a third-party domain, or cookies that have the HTTPOnly
+        //     attribute: https://developer.mozilla.org/en-US/docs/Web/API/Document/cookie#new-
+        //     cookie_domain
+        //     */
+        //
+        //     /*
+        //     This rule will match cookies that contain the string '_pk_' and that are set on
+        //     the path '/' and the domain 'klaro.kiprotect.com'
+        //     */
+        [/^_ga.?$/],
+        [/^_gid$/],
+        //
+        //     /*
+        //     Same as above, only for the 'localhost' domain
+        //     */
+        //     [/^_pk_.*$/, '/', 'localhost'],
+        //
+        //     /*
+        //     This rule will match all cookies named 'piwik_ignore' that are set on the path
+        //     '/' on the current domain
+        //     */
+        //     'piwik_ignore',
+      ],
+      /*
+      If 'onlyOnce' is set to 'true', the app will only be executed once regardless
+      how often the user toggles it on and off. This is relevant e.g. for tracking
+      scripts that would generate new page view events every time Klaro disables and
+      re-enables them due to a consent change by the user.
+      */
+      onlyOnce: true,
+    },
+  ],
+};
diff --git a/src/app/shared/cookies/klaro.service.ts b/src/app/shared/cookies/klaro.service.ts
new file mode 100644
index 00000000000..64dee85b65e
--- /dev/null
+++ b/src/app/shared/cookies/klaro.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+
+/**
+ * Abstract class representing a service for handling Klaro consent preferences and UI
+ */
+@Injectable()
+export abstract class KlaroService {
+  /**
+   * Initializes the service
+   */
+  abstract initialize();
+
+  /**
+   * Shows a the dialog with the current consent preferences
+   */
+  abstract showSettings();
+}
diff --git a/src/app/shared/date.util.ts b/src/app/shared/date.util.ts
index 5e918719676..afbdabc8561 100644
--- a/src/app/shared/date.util.ts
+++ b/src/app/shared/date.util.ts
@@ -3,6 +3,8 @@ import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 import { isObject } from 'lodash';
 import * as moment from 'moment';
 
+import { isNull } from './empty.util';
+
 /**
  * Returns true if the passed value is a NgbDateStruct.
  *
@@ -13,7 +15,7 @@ import * as moment from 'moment';
  */
 export function isNgbDateStruct(value: object): boolean {
   return isObject(value) && value.hasOwnProperty('day')
-    && value.hasOwnProperty('month')  && value.hasOwnProperty('year');
+    && value.hasOwnProperty('month') && value.hasOwnProperty('year');
 }
 
 /**
@@ -56,3 +58,57 @@ export function dateToISOFormat(date: Date | NgbDateStruct): string {
 export function ngbDateStructToDate(date: NgbDateStruct): Date {
   return new Date(date.year, (date.month - 1), date.day);
 }
+
+/**
+ * Returns a NgbDateStruct object started from a string representing a date
+ *
+ * @param date
+ *    The Date to convert
+ * @return NgbDateStruct
+ *    the NgbDateStruct object
+ */
+export function stringToNgbDateStruct(date: string): NgbDateStruct {
+  return dateToNgbDateStruct(new Date(date));
+}
+
+/**
+ * Returns a NgbDateStruct object started from a Date object
+ *
+ * @param date
+ *    The Date to convert
+ * @return NgbDateStruct
+ *    the NgbDateStruct object
+ */
+export function dateToNgbDateStruct(date?: Date): NgbDateStruct {
+  if (isNull(date)) {
+    date = new Date()
+  }
+
+  return {
+    year: date.getFullYear(),
+    month: date.getMonth() + 1,
+    day: date.getDate()
+  };
+}
+
+/**
+ * Returns a date in simplified format (YYYY-MM-DD).
+ *
+ * @param date
+ *    The date to format
+ * @return string
+ *    the formatted date
+ */
+export function dateToString(date: Date | NgbDateStruct): string {
+  const dateObj: Date = (date instanceof Date) ? date : ngbDateStructToDate(date);
+
+  let year = dateObj.getFullYear().toString();
+  let month = (dateObj.getMonth() + 1).toString();
+  let day = dateObj.getDate().toString();
+
+  year = (year.length === 1) ? '0' + year : year;
+  month = (month.length === 1) ? '0' + month : month;
+  day = (day.length === 1) ? '0' + day : day;
+  const dateStr = `${year}-${month}-${day}`;
+  return moment.utc(dateStr, 'YYYYMMDD').format('YYYY-MM-DD');
+}
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
new file mode 100644
index 00000000000..5a15155d4f4
--- /dev/null
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -0,0 +1,31 @@
+<div>
+
+  <div ngbDropdown class="btn-group" (openChange)="toggled.emit($event)">
+
+    <div class="input-group-prepend" *ngIf="label">
+      <span id="dsSelectMenuLabel" class="input-group-text">
+        {{ label | translate }}
+      </span>
+    </div>
+
+    <button aria-describedby="dsSelectMenuLabel"
+            id="dsSelectMenuButton"
+            class="btn btn-outline-primary selection"
+            (blur)="close.emit($event)"
+            (click)="close.emit($event)"
+            [disabled]="disabled"
+            ngbDropdownToggle>
+      <ng-content select=".selection"></ng-content>
+    </button>
+
+    <div ngbDropdownMenu
+         class="dropdown-menu"
+         id="dsSelectDropdownMenu"
+         aria-labelledby="dsSelectMenuButton">
+      <div aria-labelledby="dropdownMenuButton">
+        <ng-content select=".menu"></ng-content>
+      </div>
+    </div>
+  </div>
+
+</div>
diff --git a/src/app/shared/ds-select/ds-select.component.scss b/src/app/shared/ds-select/ds-select.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/shared/ds-select/ds-select.component.spec.ts b/src/app/shared/ds-select/ds-select.component.spec.ts
new file mode 100644
index 00000000000..ddec73348c0
--- /dev/null
+++ b/src/app/shared/ds-select/ds-select.component.spec.ts
@@ -0,0 +1,30 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DsSelectComponent } from './ds-select.component';
+import { TranslateModule } from '@ngx-translate/core';
+
+describe('DsSelectComponent', () => {
+  let component: DsSelectComponent;
+  let fixture: ComponentFixture<DsSelectComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        DsSelectComponent,
+      ],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsSelectComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
new file mode 100644
index 00000000000..26d1560c019
--- /dev/null
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -0,0 +1,36 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+/**
+ * Component which represent a DSpace dropdown selector.
+ */
+@Component({
+  selector: 'ds-select',
+  templateUrl: './ds-select.component.html',
+  styleUrls: ['./ds-select.component.scss']
+})
+export class DsSelectComponent {
+
+  /**
+   * An optional label for the dropdown selector.
+   */
+  @Input()
+  label: string;
+
+  /**
+   * Whether the dropdown selector is disabled.
+   */
+  @Input()
+  disabled: boolean;
+
+  /**
+   * Emits an event when the dropdown selector is opened or closed.
+   */
+  @Output()
+  toggled = new EventEmitter();
+
+  /**
+   * Emits an event when the dropdown selector or closed.
+   */
+  @Output()
+  close = new EventEmitter();
+}
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html
new file mode 100644
index 00000000000..0cfa333ae06
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html
@@ -0,0 +1,6 @@
+<a *ngIf="isAuthorized$ | async"
+   [routerLink]="['/' + pageRoutePrefix, dso.id, 'edit']"
+   class="edit-button btn btn-dark text-light btn-sm"
+   [tooltip]="tooltipMsg | translate">
+  <i class="fas fa-pencil-alt fa-fw"></i>
+</a>
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
new file mode 100644
index 00000000000..c308aa71b96
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
@@ -0,0 +1,3 @@
+.btn-dark {
+  background-color: $admin-sidebar-bg;
+}
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts
new file mode 100644
index 00000000000..b0d2f3a1fa0
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts
@@ -0,0 +1,76 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DsoPageEditButtonComponent } from './dso-page-edit-button.component';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { of as observableOf } from 'rxjs';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { By } from '@angular/platform-browser';
+import { TooltipModule } from 'ngx-bootstrap';
+
+describe('DsoPageEditButtonComponent', () => {
+  let component: DsoPageEditButtonComponent;
+  let fixture: ComponentFixture<DsoPageEditButtonComponent>;
+
+  let authorizationService: AuthorizationDataService;
+  let dso: DSpaceObject;
+
+  beforeEach(async(() => {
+    dso = Object.assign(new Item(), {
+      id: 'test-item',
+      _links: {
+        self: { href: 'test-item-selflink' }
+      }
+    });
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });
+    TestBed.configureTestingModule({
+      declarations: [ DsoPageEditButtonComponent ],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), TooltipModule.forRoot()],
+      providers: [
+        { provide: AuthorizationDataService, useValue: authorizationService }
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoPageEditButtonComponent);
+    component = fixture.componentInstance;
+    component.dso = dso;
+    component.pageRoutePrefix = 'test';
+    fixture.detectChanges();
+  });
+
+  it('should check the authorization of the current user', () => {
+    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self);
+  });
+
+  describe('when the user is authorized', () => {
+    beforeEach(() => {
+      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should render a link', () => {
+      const link = fixture.debugElement.query(By.css('a'));
+      expect(link).not.toBeNull();
+    });
+  });
+
+  describe('when the user is not authorized', () => {
+    beforeEach(() => {
+      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should not render a link', () => {
+      const link = fixture.debugElement.query(By.css('a'));
+      expect(link).toBeNull();
+    });
+  });
+});
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts
new file mode 100644
index 00000000000..230855a5a2f
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts
@@ -0,0 +1,43 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+
+@Component({
+  selector: 'ds-dso-page-edit-button',
+  templateUrl: './dso-page-edit-button.component.html',
+  styleUrls: ['./dso-page-edit-button.component.scss']
+})
+/**
+ * Display a button linking to the edit page of a DSpaceObject
+ */
+export class DsoPageEditButtonComponent implements OnInit {
+  /**
+   * The DSpaceObject to display a button to the edit page for
+   */
+  @Input() dso: DSpaceObject;
+
+  /**
+   * The prefix of the route to the edit page (before the object's UUID, e.g. "items")
+   */
+  @Input() pageRoutePrefix: string;
+
+  /**
+   * A message for the tooltip on the button
+   * Supports i18n keys
+   */
+  @Input() tooltipMsg: string;
+
+  /**
+   * Whether or not the current user is authorized to edit the DSpaceObject
+   */
+  isAuthorized$: Observable<boolean>;
+
+  constructor(protected authorizationService: AuthorizationDataService) { }
+
+  ngOnInit() {
+    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self);
+  }
+
+}
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
new file mode 100644
index 00000000000..25b7465ada6
--- /dev/null
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
@@ -0,0 +1,56 @@
+import { AuthorizedCollectionSelectorComponent } from './authorized-collection-selector.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VarDirective } from '../../../utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+
+describe('AuthorizedCollectionSelectorComponent', () => {
+  let component: AuthorizedCollectionSelectorComponent;
+  let fixture: ComponentFixture<AuthorizedCollectionSelectorComponent>;
+
+  let collectionService;
+  let collection;
+
+  beforeEach(async(() => {
+    collection = Object.assign(new Collection(), {
+      id: 'authorized-collection'
+    });
+    collectionService = jasmine.createSpyObj('collectionService', {
+      getAuthorizedCollection: createSuccessfulRemoteDataObject$(createPaginatedList([collection]))
+    });
+    TestBed.configureTestingModule({
+      declarations: [AuthorizedCollectionSelectorComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: SearchService, useValue: {} },
+        { provide: CollectionDataService, useValue: collectionService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AuthorizedCollectionSelectorComponent);
+    component = fixture.componentInstance;
+    component.types = [DSpaceObjectType.COLLECTION];
+    fixture.detectChanges();
+  });
+
+  describe('search', () => {
+    it('should call getAuthorizedCollection and return the authorized collection in a SearchResult', (done) => {
+      component.search('', 1).subscribe((result) => {
+        expect(collectionService.getAuthorizedCollection).toHaveBeenCalled();
+        expect(result.page.length).toEqual(1);
+        expect(result.page[0].indexableObject).toEqual(collection);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
new file mode 100644
index 00000000000..1ced533f2f2
--- /dev/null
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
@@ -0,0 +1,48 @@
+import { Component } from '@angular/core';
+import { DSOSelectorComponent } from '../dso-selector.component';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { map } from 'rxjs/operators';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { SearchResult } from '../../../search/search-result.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+
+@Component({
+  selector: 'ds-authorized-collection-selector',
+  styleUrls: ['../dso-selector.component.scss'],
+  templateUrl: '../dso-selector.component.html'
+})
+/**
+ * Component rendering a list of collections to select from
+ */
+export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent {
+  constructor(protected searchService: SearchService,
+              protected collectionDataService: CollectionDataService) {
+    super(searchService);
+  }
+
+  /**
+   * Get a query to send for retrieving the current DSO
+   */
+  getCurrentDSOQuery(): string {
+    return this.currentDSOId;
+  }
+
+  /**
+   * Perform a search for authorized collections with the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   */
+  search(query: string, page: number): Observable<PaginatedList<SearchResult<DSpaceObject>>> {
+    return this.collectionDataService.getAuthorizedCollection(query, Object.assign({
+      currentPage: page,
+      elementsPerPage: this.defaultPagination.pageSize
+    })).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((list) => buildPaginatedList(list.pageInfo, list.page.map((col) => Object.assign(new CollectionSearchResult(), { indexableObject: col }))))
+    );
+  }
+}
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index e2eda4dcfdc..0e914a37835 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -2,19 +2,34 @@
     <input type="search"
            class="form-control"
            (click)="$event.stopPropagation();"
-           placeholder="{{'dso-selector.placeholder' | translate: { type: type.toString().toLowerCase() } }}"
+           placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
            [formControl]="input" dsAutoFocus (keyup.enter)="selectSingleResult()">
 </div>
 <div class="dropdown-divider"></div>
 <div class="scrollable-menu list-group">
+  <div
+    infiniteScroll
+    [infiniteScrollDistance]="1"
+    [infiniteScrollThrottle]="300"
+    [infiniteScrollContainer]="'.scrollable-menu'"
+    [fromRoot]="true"
+    (scrolled)="onScrollDown()">
     <button class="list-group-item list-group-item-action border-0 disabled"
-            *ngIf="(listEntries$ | async)?.payload.page.length == 0">
-        {{'dso-selector.no-results' | translate: { type: type.toString().toLowerCase() } }}
+            *ngIf="listEntries.length == 0">
+        {{'dso-selector.no-results' | translate: { type: typesString } }}
     </button>
-    <button *ngFor="let listEntry of (listEntries$ | async)?.payload.page"
+    <button *ngFor="let listEntry of listEntries"
             class="list-group-item list-group-item-action border-0 list-entry"
+            [ngClass]="{'bg-primary': listEntry.indexableObject.id === currentDSOId}"
             title="{{ listEntry.indexableObject.name }}"
+            dsHoverClass="ds-hover"
             (click)="onSelect.emit(listEntry.indexableObject)" #listEntryElement>
-        <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"></ds-listable-object-component-loader>
+      <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
+                                           [linkType]=linkTypes.None [context]="getContext(listEntry.indexableObject.id)"></ds-listable-object-component-loader>
     </button>
+    <button *ngIf="hasNextPage"
+            class="list-group-item list-group-item-action border-0 list-entry">
+      <ds-loading [showMessage]="false"></ds-loading>
+    </button>
+  </div>
 </div>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss
new file mode 100644
index 00000000000..37d2ebeca7b
--- /dev/null
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss
@@ -0,0 +1,5 @@
+.scrollable-menu {
+  height: auto;
+  max-height: $dso-selector-list-max-height;
+  overflow-x: hidden;
+}
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
index b177e129883..7671f012ad8 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
@@ -6,10 +6,10 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../core/shared/item.model';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { MetadataValue } from '../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
 import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
+import { hasValue } from '../../empty.util';
+import { createPaginatedList } from '../../testing/utils.test';
 
 describe('DSOSelectorComponent', () => {
   let component: DSOSelectorComponent;
@@ -18,19 +18,46 @@ describe('DSOSelectorComponent', () => {
 
   const currentDSOId = 'test-uuid-ford-sose';
   const type = DSpaceObjectType.ITEM;
-  const searchResult = new ItemSearchResult();
-  const item = new Item();
-  item.metadata = {
-    'dc.title': [Object.assign(new MetadataValue(), {
-      value: 'Item title',
-      language: undefined
-    })]
-  };
-  searchResult.indexableObject = item;
-  searchResult.hitHighlights = {};
-  const searchService = jasmine.createSpyObj('searchService', {
-    search: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [searchResult]))
-  });
+  const searchResult = createSearchResult('current');
+
+  const firstPageResults = [
+    createSearchResult('1'),
+    createSearchResult('2'),
+    createSearchResult('3'),
+  ];
+
+  const nextPageResults = [
+    createSearchResult('4'),
+    createSearchResult('5'),
+    createSearchResult('6'),
+  ];
+
+  const searchService = {
+    search: (options: PaginatedSearchOptions) => {
+      if (hasValue(options.query) && options.query.startsWith('search.resourceid')) {
+        return createSuccessfulRemoteDataObject$(createPaginatedList([searchResult]));
+      } else if (options.pagination.currentPage === 1) {
+        return createSuccessfulRemoteDataObject$(createPaginatedList(firstPageResults));
+      } else {
+        return createSuccessfulRemoteDataObject$(createPaginatedList(nextPageResults));
+      }
+    }
+  }
+
+  function createSearchResult(name: string): ItemSearchResult {
+    return Object.assign(new ItemSearchResult(), {
+      indexableObject: Object.assign(new Item(), {
+        id: `test-result-${name}`,
+        metadata: {
+          'dc.title': [
+            {
+              value: `test result - ${name}`
+            }
+          ]
+        }
+      })
+    })
+  }
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -49,7 +76,7 @@ describe('DSOSelectorComponent', () => {
     component = fixture.componentInstance;
     debugElement = fixture.debugElement;
     component.currentDSOId = currentDSOId;
-    component.type = type;
+    component.types = [type];
 
     fixture.detectChanges();
   });
@@ -58,13 +85,23 @@ describe('DSOSelectorComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should initially call the search method on the SearchService with the given DSO uuid', () => {
-    const searchOptions = new PaginatedSearchOptions({
-      query: currentDSOId,
-      dsoType: type,
-      pagination: (component as any).defaultPagination
+  describe('populating listEntries', () => {
+    it('should not be empty', () => {
+      expect(component.listEntries.length).toBeGreaterThan(0);
     });
 
-    expect(searchService.search).toHaveBeenCalledWith(searchOptions);
+    it('should contain a combination of the current DSO and first page results', () => {
+      expect(component.listEntries).toEqual([searchResult, ...firstPageResults]);
+    });
+
+    describe('when current page increases', () => {
+      beforeEach(() => {
+        component.currentPage$.next(2);
+      });
+
+      it('should contain a combination of the current DSO, as well as first and second page results', () => {
+        expect(component.listEntries).toEqual([searchResult, ...firstPageResults, ...nextPageResults]);
+      });
+    });
   });
 });
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 3c9d399f8b9..dddcf9ca553 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -3,27 +3,33 @@ import {
   ElementRef,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
   QueryList,
   ViewChildren
 } from '@angular/core';
 import { FormControl } from '@angular/forms';
-
-import { Observable } from 'rxjs';
-import { debounceTime, startWith, switchMap } from 'rxjs/operators';
+import { debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { Context } from '../../../core/shared/context.model';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { hasValue, isEmpty, isNotEmpty } from '../../empty.util';
+import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { SearchResult } from '../../search/search-result.model';
 
 @Component({
   selector: 'ds-dso-selector',
-  // styleUrls: ['./dso-selector.component.scss'],
+  styleUrls: ['./dso-selector.component.scss'],
   templateUrl: './dso-selector.component.html'
 })
 
@@ -31,7 +37,7 @@ import { ViewMode } from '../../../core/shared/view-mode.model';
  * Component to render a list of DSO's of which one can be selected
  * The user can search the list by using the input field
  */
-export class DSOSelectorComponent implements OnInit {
+export class DSOSelectorComponent implements OnInit, OnDestroy {
   /**
    * The view mode of the listed objects
    */
@@ -42,9 +48,12 @@ export class DSOSelectorComponent implements OnInit {
   @Input() currentDSOId: string;
 
   /**
-   * The type of DSpace objects this components shows a list of
+   * The types of DSpace objects this components shows a list of
    */
-  @Input() type: DSpaceObjectType;
+  @Input() types: DSpaceObjectType[];
+
+  // list of allowed selectable dsoTypes
+  typesString: string;
 
   /**
    * Emits the selected Object when a user selects it in the list
@@ -59,12 +68,29 @@ export class DSOSelectorComponent implements OnInit {
   /**
    * Default pagination for this feature
    */
-  private defaultPagination = { id: 'dso-selector', currentPage: 1, pageSize: 5 } as any;
+  defaultPagination = { id: 'dso-selector', currentPage: 1, pageSize: 10 } as any;
 
   /**
    * List with search results of DSpace objects for the current query
    */
-  listEntries$: Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>>;
+  listEntries: Array<SearchResult<DSpaceObject>> = [];
+
+  /**
+   * The current page to load
+   * Dynamically goes up as the user scrolls down until it reaches the last page possible
+   */
+  currentPage$ = new BehaviorSubject(1);
+
+  /**
+   * Whether or not the list contains a next page to load
+   * This allows us to avoid next pages from trying to load when there are none
+   */
+  hasNextPage = false;
+
+  /**
+   * Whether or not the list should be reset next time it receives a page to load
+   */
+  resetList = false;
 
   /**
    * List of element references to all elements
@@ -76,30 +102,112 @@ export class DSOSelectorComponent implements OnInit {
    */
   debounceTime = 500;
 
-  constructor(private searchService: SearchService) {
+  /**
+   * The available link types
+   */
+  linkTypes = CollectionElementLinkType;
+
+  /**
+   * Track whether the element has the mouse over it
+   */
+  isMouseOver = false
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  public subs: Subscription[] = [];
+
+  constructor(protected searchService: SearchService) {
   }
 
   /**
-   * Fills the listEntries$ variable with search results based on the input field's current value
+   * Fills the listEntries variable with search results based on the input field's current value and the current page
    * The search will always start with the initial currentDSOId value
    */
   ngOnInit(): void {
-    this.input.setValue(this.currentDSOId);
-    this.listEntries$ = this.input.valueChanges
-      .pipe(
+    this.typesString = this.types.map((type: string) => type.toString().toLowerCase()).join(', ');
+
+    // Create an observable searching for the current DSO (return empty list if there's no current DSO)
+    let currentDSOResult$;
+    if (isNotEmpty(this.currentDSOId)) {
+      currentDSOResult$ = this.search(this.getCurrentDSOQuery(), 1);
+    } else {
+      currentDSOResult$ = observableOf(buildPaginatedList(undefined, []));
+    }
+
+    // Combine current DSO, query and page
+    this.subs.push(observableCombineLatest(
+      currentDSOResult$,
+      this.input.valueChanges.pipe(
         debounceTime(this.debounceTime),
-        startWith(this.currentDSOId),
-        switchMap((query) => {
-            return this.searchService.search(
-              new PaginatedSearchOptions({
-                query: query,
-                dsoType: this.type,
-                pagination: this.defaultPagination
-              })
-            )
-          }
-        )
-      )
+        startWith(''),
+        tap(() => this.currentPage$.next(1))
+      ),
+      this.currentPage$
+    ).pipe(
+      switchMap(([currentDSOResult, query, page]: [PaginatedList<SearchResult<DSpaceObject>>, string, number]) => {
+        if (page === 1) {
+          // The first page is loading, this means we should reset the list instead of adding to it
+          this.resetList = true;
+        }
+        return this.search(query, page).pipe(
+          map((list) => {
+            // If it's the first page and no query is entered, add the current DSO to the start of the list
+            // If no query is entered, filter out the current DSO from the results, as it'll be displayed at the start of the list already
+            list.page = [
+              ...((isEmpty(query) && page === 1) ? currentDSOResult.page : []),
+              ...list.page.filter((result) => isNotEmpty(query) || result.indexableObject.id !== this.currentDSOId)
+            ];
+            return list;
+          })
+        );
+      })
+    ).subscribe((list) => {
+      if (this.resetList) {
+        this.listEntries = list.page;
+        this.resetList = false;
+      } else {
+        this.listEntries.push(...list.page);
+      }
+      // Check if there are more pages available after the current one
+      this.hasNextPage = list.totalElements > this.listEntries.length;
+    }));
+  }
+
+  /**
+   * Get a query to send for retrieving the current DSO
+   */
+  getCurrentDSOQuery(): string {
+    return `search.resourceid:${this.currentDSOId}`;
+  }
+
+  /**
+   * Perform a search for the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   */
+  search(query: string, page: number): Observable<PaginatedList<SearchResult<DSpaceObject>>> {
+    return this.searchService.search(
+      new PaginatedSearchOptions({
+        query: query,
+        dsoTypes: this.types,
+        pagination: Object.assign({}, this.defaultPagination, {
+          currentPage: page
+        })
+      })
+    ).pipe(
+      getFirstSucceededRemoteDataPayload()
+    );
+  }
+
+  /**
+   * When the user reaches the bottom of the page (or almost) and there's a next page available, increase the current page
+   */
+  onScrollDown() {
+    if (this.hasNextPage) {
+      this.currentPage$.next(this.currentPage$.value + 1);
+    }
   }
 
   /**
@@ -110,4 +218,22 @@ export class DSOSelectorComponent implements OnInit {
       this.listElements.first.nativeElement.click();
     }
   }
+
+  /**
+   * Get the context for element with the given id
+   */
+  getContext(id: string) {
+    if (id === this.currentDSOId) {
+      return Context.SideBarSearchModalCurrent;
+    } else {
+      return Context.SideBarSearchModal;
+    }
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
index 480f6ff709a..132379efc77 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
@@ -6,7 +6,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { RouterStub } from '../../../testing/router.stub';
-import * as collectionRouter from '../../../../+collection-page/collection-page-routing.module';
+import * as collectionRouterPaths from '../../../../+collection-page/collection-page-routing-paths';
 import { Community } from '../../../../core/shared/community.model';
 import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
@@ -39,7 +39,15 @@ describe('CreateCollectionParentSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: communityRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
@@ -51,7 +59,7 @@ describe('CreateCollectionParentSelectorComponent', () => {
   }));
 
   beforeEach(() => {
-    spyOnProperty(collectionRouter, 'getCollectionCreatePath').and.callFake(() => {
+    spyOnProperty(collectionRouterPaths, 'getCollectionCreateRoute').and.callFake(() => {
       return () => createPath;
     });
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 0533addb012..64274f21e2c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -3,11 +3,11 @@ import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import {
-  COLLECTION_PARENT_PARAMETER,
-  getCollectionCreatePath
-} from '../../../../+collection-page/collection-page-routing.module';
 import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
+import {
+    getCollectionCreateRoute,
+    COLLECTION_PARENT_PARAMETER
+} from '../../../../+collection-page/collection-page-routing-paths';
 
 /**
  * Component to wrap a list of existing communities inside a modal
@@ -20,8 +20,9 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-sel
 })
 export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COLLECTION;
-  selectorType = DSpaceObjectType.COMMUNITY;
+  selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
+  header = 'dso-selector.create.collection.sub-level';
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
@@ -36,6 +37,6 @@ export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWra
         [COLLECTION_PARENT_PARAMETER]: dso.uuid,
       }
     };
-    this.router.navigate([getCollectionCreatePath()], navigationExtras);
+    this.router.navigate([getCollectionCreateRoute()], navigationExtras);
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index e6a0db3b628..84fdd34c01e 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -14,6 +14,6 @@ <h3 class="position-relative py-1 my-3 font-weight-normal">
         </h3>
 
         <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="(dsoRD$ | async)?.payload.uuid" [type]="selectorType" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
index b723d3fe980..15cf5fe3676 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
@@ -6,7 +6,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { RouterStub } from '../../../testing/router.stub';
-import * as communityRouter from '../../../../+community-page/community-page-routing.module';
+import * as communityRouterPaths from '../../../../+community-page/community-page-routing-paths';
 import { Community } from '../../../../core/shared/community.model';
 import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
@@ -33,7 +33,15 @@ describe('CreateCommunityParentSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: communityRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
@@ -45,7 +53,7 @@ describe('CreateCommunityParentSelectorComponent', () => {
   }));
 
   beforeEach(() => {
-    spyOnProperty(communityRouter, 'getCommunityCreatePath').and.callFake(() => {
+    spyOnProperty(communityRouterPaths, 'getCommunityCreateRoute').and.callFake(() => {
       return () => createPath;
     });
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 914dc7582f1..7abe8f6a0a3 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -4,14 +4,14 @@ import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.mod
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { hasValue } from '../../../empty.util';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import {
-  COMMUNITY_PARENT_PARAMETER,
-  getCommunityCreatePath
-} from '../../../../+community-page/community-page-routing.module';
 import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType
 } from '../dso-selector-modal-wrapper.component';
+import {
+    getCommunityCreateRoute,
+    COMMUNITY_PARENT_PARAMETER
+} from '../../../../+community-page/community-page-routing-paths';
 
 /**
  * Component to wrap a button - for top communities -
@@ -27,7 +27,7 @@ import {
 })
 export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COMMUNITY;
-  selectorType = DSpaceObjectType.COMMUNITY;
+  selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
@@ -46,6 +46,6 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
         }
       };
     }
-    this.router.navigate([getCommunityCreatePath()], navigationExtras);
+    this.router.navigate([getCommunityCreateRoute()], navigationExtras);
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
new file mode 100644
index 00000000000..8761e4eb9ed
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-authorized-collection-selector>
+  </div>
+</div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
index 854349a47c8..e8cd35fb508 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
@@ -32,7 +32,15 @@ describe('CreateItemParentSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ collection: collectionRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: collectionRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index 02a0bd79cd9..03d7732fb05 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -13,12 +13,14 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-sel
 @Component({
   selector: 'ds-create-item-parent-selector',
   // styleUrls: ['./create-item-parent-selector.component.scss'],
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  // templateUrl: '../dso-selector-modal-wrapper.component.html',
+  templateUrl: './create-item-parent-selector.component.html'
 })
 export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
-  selectorType = DSpaceObjectType.COLLECTION;
+  selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.CREATE;
+  header = 'dso-selector.create.item.sub-level';
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 1181e097eb3..85d8797e660 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -5,6 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <ds-dso-selector [currentDSOId]="(dsoRD$ | async)?.payload.uuid ? 'search.resourceid:' + (dsoRD$ | async)?.payload.uuid : null" [type]="selectorType" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
index 7b5c020f1b6..0422953e178 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
@@ -41,8 +41,16 @@ describe('DSOSelectorModalWrapperComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ item: itemRD }) } } } }
-        }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: itemRD,
+                },
+              },
+            }
+          }
+        },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -63,11 +71,7 @@ describe('DSOSelectorModalWrapperComponent', () => {
   });
 
   it('should initially set the DSO to the activated route\'s item/collection/community', () => {
-    component.dsoRD$
-      .pipe(first())
-      .subscribe((a) => {
-        expect(a).toEqual(itemRD);
-      })
+    expect(component.dsoRD).toEqual(itemRD);
   });
 
   describe('selectObject', () => {
@@ -120,7 +124,7 @@ describe('DSOSelectorModalWrapperComponent', () => {
 })
 class TestComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
-  selectorType = DSpaceObjectType.ITEM;
+  selectorTypes = [DSpaceObjectType.ITEM];
   action = SelectorActionType.EDIT;
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
index 881476cac6e..59aeceea0f6 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
@@ -1,15 +1,15 @@
 import { Injectable, Input, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { map } from 'rxjs/operators';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { hasValue, isNotEmpty } from '../../empty.util';
 
 export enum SelectorActionType {
   CREATE = 'create',
-  EDIT = 'edit'
+  EDIT = 'edit',
+  EXPORT_METADATA = 'export-metadata'
 }
 
 /**
@@ -21,17 +21,23 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   /**
    * The current page's DSO
    */
-  @Input() dsoRD$: Observable<RemoteData<DSpaceObject>>;
+  @Input() dsoRD: RemoteData<DSpaceObject>;
 
   /**
-   * The type of the DSO that's being edited or created
+   * Optional header to display above the selection list
+   * Supports i18n keys
+   */
+  @Input() header: string;
+
+  /**
+   * The type of the DSO that's being edited, created or exported
    */
   objectType: DSpaceObjectType;
 
   /**
-   * The type of DSO that can be selected from this list
+   * The types of DSO that can be selected from this list
    */
-  selectorType: DSpaceObjectType;
+  selectorTypes: DSpaceObjectType[];
 
   /**
    * The type of action to perform
@@ -45,10 +51,30 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    * Get de current page's DSO based on the selectorType
    */
   ngOnInit(): void {
-    const typeString = this.selectorType.toString().toLowerCase();
-    this.dsoRD$ = this.route.root.firstChild.firstChild.data.pipe(map((data) => data[typeString]));
+    const matchingRoute = this.findRouteData(
+      (route: ActivatedRouteSnapshot) => hasValue(route.data.dso),
+      this.route.root.snapshot
+    );
+    if (hasValue(matchingRoute)) {
+      this.dsoRD = matchingRoute.data.dso;
+    }
   }
 
+  findRouteData(predicate: (value: ActivatedRouteSnapshot, index?: number, obj?: ActivatedRouteSnapshot[]) => unknown, ...routes: ActivatedRouteSnapshot[]) {
+    const result = routes.find(predicate);
+    if (hasValue(result)) {
+      return result;
+    } else {
+      const nextLevelRoutes = routes
+        .map((route: ActivatedRouteSnapshot) => route.children)
+        .reduce((combined: ActivatedRouteSnapshot[], current: ActivatedRouteSnapshot[]) => [...combined, ...current]);
+      if (isNotEmpty(nextLevelRoutes)) {
+        return this.findRouteData(predicate, ...nextLevelRoutes)
+      } else {
+        return undefined;
+      }
+    }
+  }
   /**
    * Method called when an object has been selected
    * @param dso The selected DSpaceObject
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
index a17d9e4c218..81040e558d9 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
@@ -6,7 +6,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { RouterStub } from '../../../testing/router.stub';
-import * as collectionRouter from '../../../../+collection-page/collection-page-routing.module';
+import * as collectionRouterPaths from '../../../../+collection-page/collection-page-routing-paths';
 import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
 import { Collection } from '../../../../core/shared/collection.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
@@ -33,7 +33,15 @@ describe('EditCollectionSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ collection: collectionRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: collectionRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
@@ -45,7 +53,7 @@ describe('EditCollectionSelectorComponent', () => {
   }));
 
   beforeEach(() => {
-    spyOnProperty(collectionRouter, 'getCollectionEditPath').and.callFake(() => {
+    spyOnProperty(collectionRouterPaths, 'getCollectionEditRoute').and.callFake(() => {
       return () => editPath;
     });
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 79660b95891..cd0dda9af33 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -3,11 +3,11 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { getCollectionEditPath } from '../../../../+collection-page/collection-page-routing.module';
 import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType
 } from '../dso-selector-modal-wrapper.component';
+import { getCollectionEditRoute } from '../../../../+collection-page/collection-page-routing-paths';
 
 /**
  * Component to wrap a list of existing collections inside a modal
@@ -20,7 +20,7 @@ import {
 })
 export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COLLECTION;
-  selectorType = DSpaceObjectType.COLLECTION;
+  selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.EDIT;
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
@@ -31,6 +31,6 @@ export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComp
    * Navigate to the collection edit page
    */
   navigate(dso: DSpaceObject) {
-    this.router.navigate([getCollectionEditPath(dso.uuid)]);
+    this.router.navigate([getCollectionEditRoute(dso.uuid)]);
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
index c48d29baa90..260d15725e1 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
@@ -6,7 +6,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { RouterStub } from '../../../testing/router.stub';
-import * as communityRouter from '../../../../+community-page/community-page-routing.module';
+import * as communityRouterPaths from '../../../../+community-page/community-page-routing-paths';
 import { EditCommunitySelectorComponent } from './edit-community-selector.component';
 import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
@@ -33,7 +33,15 @@ describe('EditCommunitySelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: communityRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
@@ -45,7 +53,7 @@ describe('EditCommunitySelectorComponent', () => {
   }));
 
   beforeEach(() => {
-    spyOnProperty(communityRouter, 'getCommunityEditPath').and.callFake(() => {
+    spyOnProperty(communityRouterPaths, 'getCommunityEditRoute').and.callFake(() => {
         return () => editPath;
     });
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 6b9efc1ff4b..0d440e16c9a 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -3,11 +3,11 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { getCommunityEditPath } from '../../../../+community-page/community-page-routing.module';
 import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType
 } from '../dso-selector-modal-wrapper.component';
+import { getCommunityEditRoute } from '../../../../+community-page/community-page-routing-paths';
 
 /**
  * Component to wrap a list of existing communities inside a modal
@@ -21,7 +21,7 @@ import {
 
 export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COMMUNITY;
-  selectorType = DSpaceObjectType.COMMUNITY;
+  selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.EDIT;
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
@@ -32,6 +32,6 @@ export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperCompo
    * Navigate to the community edit page
    */
   navigate(dso: DSpaceObject) {
-    this.router.navigate([getCommunityEditPath(dso.uuid)]);
+    this.router.navigate([getCommunityEditRoute(dso.uuid)]);
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
index 582320acae9..67be305ccd9 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
@@ -1,14 +1,12 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute, Router } from '@angular/router';
 import { EditItemSelectorComponent } from './edit-item-selector.component';
 import { Item } from '../../../../core/shared/item.model';
-import { RemoteData } from '../../../../core/data/remote-data';
 import { RouterStub } from '../../../testing/router.stub';
-import * as itemRouter from '../../../../+item-page/item-page-routing.module';
+import * as itemRouterPaths from '../../../../+item-page/item-page-routing-paths';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 
@@ -33,7 +31,15 @@ describe('EditItemSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ item: itemRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: itemRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
@@ -45,7 +51,7 @@ describe('EditItemSelectorComponent', () => {
   }));
 
   beforeEach(() => {
-    spyOnProperty(itemRouter, 'getItemEditPath').and.callFake(() => {
+    spyOnProperty(itemRouterPaths, 'getItemEditRoute').and.callFake(() => {
         return () => editPath;
     });
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index dae36d3017d..5288c1a1979 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { getItemEditPath } from '../../../../+item-page/item-page-routing.module';
 import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
+import { getItemEditRoute } from '../../../../+item-page/item-page-routing-paths';
 
 /**
  * Component to wrap a list of existing items inside a modal
@@ -17,7 +17,7 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-sel
 })
 export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
-  selectorType = DSpaceObjectType.ITEM;
+  selectorTypes = [DSpaceObjectType.ITEM];
   action = SelectorActionType.EDIT;
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
@@ -28,6 +28,6 @@ export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent
    * Navigate to the item edit page
    */
   navigate(dso: DSpaceObject) {
-    this.router.navigate([getItemEditPath(dso.uuid)]);
+    this.router.navigate([getItemEditRoute(dso.uuid)]);
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
new file mode 100644
index 00000000000..ced38b92659
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
@@ -0,0 +1,217 @@
+import { of as observableOf } from 'rxjs';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { DebugElement, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NgbActiveModal, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import { ActivatedRoute, Router } from '@angular/router';
+import { METADATA_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { Item } from '../../../../core/shared/item.model';
+import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
+import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../remote-data.utils';
+import { ExportMetadataSelectorComponent } from './export-metadata-selector.component';
+
+// No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents
+@NgModule({
+  imports: [ NgbModalModule,
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useClass: TranslateLoaderMock
+      }
+    }),
+  ],
+  exports: [],
+  declarations: [ConfirmationModalComponent],
+  providers: [],
+  entryComponents: [ConfirmationModalComponent],
+})
+class ModelTestModule { }
+
+describe('ExportMetadataSelectorComponent', () => {
+  let component: ExportMetadataSelectorComponent;
+  let fixture: ComponentFixture<ExportMetadataSelectorComponent>;
+  let debugElement: DebugElement;
+  let modalRef;
+
+  let router;
+  let notificationService: NotificationsServiceStub;
+  let scriptService;
+
+  const mockItem = Object.assign(new Item(), {
+    id: 'fake-id',
+    handle: 'fake/handle',
+    lastModified: '2018'
+  });
+
+  const mockCollection: Collection = Object.assign(new Collection(), {
+    id: 'test-collection-1-1',
+    name: 'test-collection-1',
+    metadata: {
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'fake/test-collection-1'
+        }
+      ]
+    }
+  });
+
+  const mockCommunity = Object.assign(new Community(), {
+    id: 'test-uuid',
+    metadata: {
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'fake/test-community-1'
+        }
+      ]
+    }
+  });
+
+  const itemRD = createSuccessfulRemoteDataObject(mockItem);
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+
+  beforeEach(async(() => {
+    notificationService = new NotificationsServiceStub();
+    router = jasmine.createSpyObj('router', {
+      navigateByUrl: jasmine.createSpy('navigateByUrl')
+    });
+    scriptService = jasmine.createSpyObj('scriptService',
+      {
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
+      }
+    );
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule],
+      declarations: [ExportMetadataSelectorComponent],
+      providers: [
+        { provide: NgbActiveModal, useValue: modalStub },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: ScriptDataService, useValue: scriptService },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: itemRD,
+                },
+              },
+            }
+          },
+        },
+        {
+          provide: Router, useValue: router
+        }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ExportMetadataSelectorComponent);
+    component = fixture.componentInstance;
+    debugElement = fixture.debugElement;
+    const modalService = TestBed.get(NgbModal);
+    modalRef = modalService.open(ConfirmationModalComponent);
+    modalRef.componentInstance.response = observableOf(true);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('if item is selected', () => {
+    let scriptRequestSucceeded;
+    beforeEach((done) => {
+      component.navigate(mockItem).subscribe((succeeded: boolean) => {
+        scriptRequestSucceeded = succeeded;
+        done()
+      });
+    });
+    it('should not invoke metadata-export script', () => {
+      expect(scriptService.invoke).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('if collection is selected', () => {
+    let scriptRequestSucceeded;
+    beforeEach((done) => {
+      spyOn((component as any).modalService, 'open').and.returnValue(modalRef);
+      component.navigate(mockCollection).subscribe((succeeded: boolean) => {
+        scriptRequestSucceeded = succeeded;
+        done()
+      });
+    });
+    it('metadata-export script is invoked with its -i handle and -f uuid.csv', () => {
+      const parameterValues: ProcessParameter[] = [
+        Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.handle }),
+        Object.assign(new ProcessParameter(), { name: '-f', value: mockCollection.uuid + '.csv' }),
+      ];
+      expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
+    });
+    it('success notification is shown', () => {
+      expect(scriptRequestSucceeded).toBeTrue();
+      expect(notificationService.success).toHaveBeenCalled();
+    });
+    it('redirected to process page', () => {
+      expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45');
+    });
+  });
+
+  describe('if community is selected', () => {
+    let scriptRequestSucceeded;
+    beforeEach((done) => {
+      spyOn((component as any).modalService, 'open').and.returnValue(modalRef);
+      component.navigate(mockCommunity).subscribe((succeeded: boolean) => {
+        scriptRequestSucceeded = succeeded;
+        done()
+      });
+    });
+    it('metadata-export script is invoked with its -i handle and -f uuid.csv', () => {
+      const parameterValues: ProcessParameter[] = [
+        Object.assign(new ProcessParameter(), { name: '-i', value: mockCommunity.handle }),
+        Object.assign(new ProcessParameter(), { name: '-f', value: mockCommunity.uuid + '.csv' }),
+      ];
+      expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
+    });
+    it('success notification is shown', () => {
+      expect(scriptRequestSucceeded).toBeTrue();
+      expect(notificationService.success).toHaveBeenCalled();
+    });
+    it('redirected to process page', () => {
+      expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45');
+    });
+  });
+
+  describe('if community/collection is selected; but script invoke fails', () => {
+    let scriptRequestSucceeded;
+    beforeEach((done) => {
+      spyOn((component as any).modalService, 'open').and.returnValue(modalRef);
+      jasmine.getEnv().allowRespy(true);
+      spyOn(scriptService, 'invoke').and.returnValue(createFailedRemoteDataObject$('Error', 500));
+      component.navigate(mockCommunity).subscribe((succeeded: boolean) => {
+        scriptRequestSucceeded = succeeded;
+        done()
+      });
+    });
+    it('error notification is shown', () => {
+      expect(scriptRequestSucceeded).toBeFalse();
+      expect(notificationService.error).toHaveBeenCalled();
+    });
+  });
+
+});
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
new file mode 100644
index 00000000000..8ec8c98f47d
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
@@ -0,0 +1,112 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { map, switchMap } from 'rxjs/operators';
+import { of as observableOf } from 'rxjs';
+import {
+  METADATA_EXPORT_SCRIPT_NAME,
+  ScriptDataService
+} from '../../../../core/data/processes/script-data.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
+import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
+import { isNotEmpty } from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType
+} from '../dso-selector-modal-wrapper.component';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { Process } from '../../../../process-page/processes/process.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
+
+/**
+ * Component to wrap a list of existing dso's inside a modal
+ * Used to choose a dso from to export metadata of
+ */
+@Component({
+  selector: 'ds-export-metadata-selector',
+  templateUrl: '../dso-selector-modal-wrapper.component.html',
+})
+export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
+  objectType = DSpaceObjectType.DSPACEOBJECT;
+  selectorTypes = [DSpaceObjectType.COLLECTION, DSpaceObjectType.COMMUNITY];
+  action = SelectorActionType.EXPORT_METADATA;
+
+  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router,
+              protected notificationsService: NotificationsService, protected translationService: TranslateService,
+              protected scriptDataService: ScriptDataService,
+              private modalService: NgbModal) {
+    super(activeModal, route);
+  }
+
+  /**
+   * If the dso is a collection or community: start export-metadata script & navigate to process if successful
+   * Otherwise show error message
+   */
+  navigate(dso: DSpaceObject): Observable<boolean> {
+    if (dso instanceof Collection || dso instanceof Community) {
+      const modalRef = this.modalService.open(ConfirmationModalComponent);
+      modalRef.componentInstance.dso = dso;
+      modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata.header';
+      modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata.info';
+      modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata.cancel';
+      modalRef.componentInstance.confirmLabel = 'confirmation-modal.export-metadata.confirm';
+      const resp$ =  modalRef.componentInstance.response.pipe(switchMap((confirm: boolean) => {
+        if (confirm) {
+          const startScriptSucceeded$ = this.startScriptNotifyAndRedirect(dso, dso.handle);
+          return startScriptSucceeded$.pipe(
+            switchMap((r: boolean) => {
+              return observableOf(r);
+            })
+          )
+        } else {
+          const modalRefExport = this.modalService.open(ExportMetadataSelectorComponent);
+          modalRefExport.componentInstance.dsoRD = createSuccessfulRemoteDataObject(dso);
+        }
+      }));
+      resp$.subscribe();
+      return resp$;
+    } else {
+      return observableOf(false);
+    }
+  }
+
+  /**
+   * Start export-metadata script of dso & navigate to process if successful
+   * Otherwise show error message
+   * @param dso   Dso to export
+   */
+  private startScriptNotifyAndRedirect(dso: DSpaceObject, handle: string): Observable<boolean> {
+    const parameterValues: ProcessParameter[] = [
+      Object.assign(new ProcessParameter(), { name: '-i', value: handle }),
+      Object.assign(new ProcessParameter(), { name: '-f', value: dso.uuid + '.csv' }),
+    ];
+    return this.scriptDataService.invoke(METADATA_EXPORT_SCRIPT_NAME, parameterValues, [])
+      .pipe(
+        getFirstCompletedRemoteData(),
+        map((rd: RemoteData<Process>) => {
+          if (rd.hasSucceeded) {
+            const title = this.translationService.get('process.new.notification.success.title');
+            const content = this.translationService.get('process.new.notification.success.content');
+            this.notificationsService.success(title, content);
+            if (isNotEmpty(rd.payload)) {
+              this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
+            }
+            return true;
+          } else {
+            const title = this.translationService.get('process.new.notification.error.title');
+            const content = this.translationService.get('process.new.notification.error.content');
+            this.notificationsService.error(title, content);
+            return false;
+          }
+        }));
+  }
+}
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
new file mode 100644
index 00000000000..06624c8b40e
--- /dev/null
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -0,0 +1,6 @@
+<a *ngIf="!(isAuthenticated$ | async)" [href]="href" [download]="download"><ng-container *ngTemplateOutlet="content"></ng-container></a>
+<a *ngIf="(isAuthenticated$ | async)" [href]="href" [download]="download" (click)="downloadFile()"><ng-container *ngTemplateOutlet="content"></ng-container></a>
+
+<ng-template #content>
+  <ng-content></ng-content>
+</ng-template>
diff --git a/src/app/shared/file-download-link/file-download-link.component.scss b/src/app/shared/file-download-link/file-download-link.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts
new file mode 100644
index 00000000000..56702787d3f
--- /dev/null
+++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts
@@ -0,0 +1,59 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FileDownloadLinkComponent } from './file-download-link.component';
+import { AuthService } from '../../core/auth/auth.service';
+import { FileService } from '../../core/shared/file.service';
+import { of as observableOf } from 'rxjs';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+
+describe('FileDownloadLinkComponent', () => {
+  let component: FileDownloadLinkComponent;
+  let fixture: ComponentFixture<FileDownloadLinkComponent>;
+
+  let authService: AuthService;
+  let fileService: FileService;
+  let href: string;
+
+  function init() {
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true)
+    });
+    fileService = jasmine.createSpyObj('fileService', ['downloadFile']);
+    href = 'test-download-file-link';
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [FileDownloadLinkComponent],
+      providers: [
+        { provide: AuthService, useValue: authService },
+        { provide: FileService, useValue: fileService },
+        { provide: HardRedirectService, useValue: { rewriteDownloadURL: (a) => a } },
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FileDownloadLinkComponent);
+    component = fixture.componentInstance;
+    component.href = href;
+    fixture.detectChanges();
+  });
+
+  describe('downloadFile', () => {
+    let result;
+
+    beforeEach(() => {
+      result = component.downloadFile();
+    });
+
+    it('should call fileService.downloadFile with the provided href', () => {
+      expect(fileService.downloadFile).toHaveBeenCalledWith(href);
+    });
+
+    it('should return false', () => {
+      expect(result).toEqual(false);
+    });
+  });
+});
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
new file mode 100644
index 00000000000..71283642c93
--- /dev/null
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -0,0 +1,51 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { FileService } from '../../core/shared/file.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { AuthService } from '../../core/auth/auth.service';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+
+@Component({
+  selector: 'ds-file-download-link',
+  templateUrl: './file-download-link.component.html',
+  styleUrls: ['./file-download-link.component.scss']
+})
+/**
+ * Component displaying a download link
+ * When the user is authenticated, a short-lived token retrieved from the REST API is added to the download link,
+ * ensuring the user is authorized to download the file.
+ */
+export class FileDownloadLinkComponent implements OnInit {
+  /**
+   * Href to link to
+   */
+  @Input() href: string;
+
+  /**
+   * Optional file name for the download
+   */
+  @Input() download: string;
+
+  /**
+   * Whether or not the current user is authenticated
+   */
+  isAuthenticated$: Observable<boolean>;
+
+  constructor(private fileService: FileService,
+              private authService: AuthService,
+              private redirectService: HardRedirectService) {
+  }
+
+  ngOnInit() {
+    this.isAuthenticated$ = this.authService.isAuthenticated();
+    this.href = this.redirectService.rewriteDownloadURL(this.href);
+  }
+
+  /**
+   * Start a download of the file
+   * Return false to ensure the original href is displayed when the user hovers over the link
+   */
+  downloadFile(): boolean {
+    this.fileService.downloadFile(this.href);
+    return false;
+  }
+}
diff --git a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
new file mode 100644
index 00000000000..759f84ef452
--- /dev/null
+++ b/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -0,0 +1,28 @@
+<div ng2FileDrop
+     class="ds-document-drop-zone position-fixed h-100 w-100"
+     [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
+     [uploader]="uploader"
+     (onFileDrop)="setFile($event)"
+     (fileOver)="fileOverDocument($event)">
+</div>
+<div *ngIf="(isOverDocumentDropZone | async)"
+     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+  <div
+    class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
+    <p class="text-primary">{{ dropMessageLabel | translate}}</p>
+  </div>
+</div>
+<div class="well ds-base-drop-zone mt-1 mb-3 text-muted p-2">
+  <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center"
+     *ngIf="fileObject!=null">  {{ fileObject.name }} </p>
+  <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center">
+      <span><i class="fas fa-cloud-upload"
+               aria-hidden="true"></i> {{ (fileObject == null ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
+    <label class="btn btn-link m-0 p-0 ml-1">
+      <input class="form-control-file d-none" requireFile #file="ngModel" type="file" name="file-upload"
+             id="file-upload"
+             [ngModel]="fileObject" (ngModelChange)="setFile($event)">
+      {{'uploader.browse' | translate}}
+    </label>
+  </p>
+</div>
diff --git a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts b/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
new file mode 100644
index 00000000000..0ce822bc0ee
--- /dev/null
+++ b/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
@@ -0,0 +1,92 @@
+import { Component, EventEmitter, HostListener, Input, OnInit, Output } from '@angular/core';
+import { uniqueId } from 'lodash';
+import { FileUploader } from 'ng2-file-upload';
+import { Observable } from 'rxjs/internal/Observable';
+import { UploaderOptions } from '../uploader/uploader-options.model';
+import { of as observableOf } from 'rxjs';
+
+/**
+ * Component to have a file dropzone without that dropping/choosing a file in browse automatically triggers
+ * the uploader, instead an event is emitted with the file that was added.
+ *
+ * Here only one file is allowed to be selected, so if one is selected/dropped the message changes to a
+ * replace message.
+ */
+@Component({
+  selector: 'ds-file-dropzone-no-uploader',
+  templateUrl: './file-dropzone-no-uploader.component.html',
+  styleUrls: ['./file-dropzone-no-uploader.scss']
+})
+export class FileDropzoneNoUploaderComponent implements OnInit {
+
+  public isOverDocumentDropZone: Observable<boolean>;
+  public uploader: FileUploader;
+  public uploaderId: string;
+
+  @Input() dropMessageLabel: string;
+  @Input() dropMessageLabelReplacement: string;
+
+  /**
+   * The function to call when file is added
+   */
+  @Output() onFileAdded: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * The uploader configuration options
+   * @type {UploaderOptions}
+   */
+  uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
+    // URL needs to contain something to not produce any errors. We are using onFileDrop; not the uploader
+    url: 'placeholder',
+  });
+
+  /**
+   * The current value of the file
+   */
+  fileObject: File;
+
+  /**
+   * Method provided by Angular. Invoked after the constructor.
+   */
+  ngOnInit() {
+    this.uploaderId = 'ds-drag-and-drop-uploader' + uniqueId();
+    this.isOverDocumentDropZone = observableOf(false);
+    this.uploader = new FileUploader({
+      // required, but using onFileDrop, not uploader
+      url: 'placeholder',
+    });
+  }
+
+  @HostListener('window:drop', ['$event'])
+  onDrop(event: any) {
+    event.preventDefault();
+  }
+
+  @HostListener('window:dragover', ['$event'])
+  onDragOver(event: any) {
+    // Show drop area on the page
+    event.preventDefault();
+    if ((event.target as any).tagName !== 'HTML') {
+      this.isOverDocumentDropZone = observableOf(true);
+    }
+  }
+
+  /**
+   * Called when files are dragged on the window document drop area.
+   */
+  public fileOverDocument(isOver: boolean) {
+    if (!isOver) {
+      this.isOverDocumentDropZone = observableOf(isOver);
+    }
+  }
+
+  /**
+   * Set file
+   * @param files
+   */
+  setFile(files) {
+    this.fileObject = files.length > 0 ? files[0] : undefined;
+    this.onFileAdded.emit(this.fileObject);
+  }
+
+}
diff --git a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.scss b/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
new file mode 100644
index 00000000000..94b0fefb4bc
--- /dev/null
+++ b/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
@@ -0,0 +1,29 @@
+.ds-base-drop-zone {
+  border: 2px dashed $gray-600;
+}
+
+.ds-document-drop-zone {
+  top: 0;
+  left: 0;
+  z-index: -1;
+}
+
+.ds-document-drop-zone-active {
+  z-index: $drop-zone-area-z-index !important;
+}
+
+.ds-document-drop-zone-inner {
+  background-color: rgba($white, 0.7);
+  z-index: $drop-zone-area-inner-z-index;
+  top: 0;
+  left: 0;
+}
+
+.ds-document-drop-zone-inner-content {
+  border: 4px dashed map-get($theme-colors, primary);
+  z-index: $drop-zone-area-inner-z-index;
+}
+
+.ds-document-drop-zone-inner-content p {
+  font-size: ($font-size-lg * 2.5);
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants.ts
new file mode 100644
index 00000000000..d3cdad290f5
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants.ts
@@ -0,0 +1,2 @@
+export const DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP = 'RELATION';
+export const PLACEHOLDER_PARENT_METADATA = '#PLACEHOLDER_PARENT_METADATA_VALUE#';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index a31171d7ef3..028299f7607 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -1,29 +1,25 @@
-<div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
+<div [class.form-group]="asBootstrapFormGroup"
      [formGroup]="group"
      [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
-
     <label *ngIf="!isCheckbox && hasLabel"
            [for]="model.id"
            [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
            [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
-
     <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: model"></ng-container>
-
-    <div [ngClass]="{'form-row': model.hasLanguages || hasRelationLookup }">
+    <!--    Should be *ngIf instead of class d-none, but that breaks the #componentViewContainer reference-->
+    <div [ngClass]="{'form-row': model.hasLanguages || isRelationship,
+                      'd-none': value?.isVirtual && (model.hasSelectableMetadata || context?.index > 0)}">
         <div [ngClass]="getClass('grid', 'control')">
-
             <ng-container #componentViewContainer></ng-container>
-
-            <small *ngIf="hasHint && (!showErrorMessages || errorMessages.length === 0)"
+            <small *ngIf="hasHint && (model.repeatable === false || context?.index === 0) && (!showErrorMessages || errorMessages.length === 0)"
                    class="text-muted" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
 
             <div *ngIf="showErrorMessages" [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
-                <small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate:model.validators }}</small>
+                <small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate: model.validators }}</small>
             </div>
 
         </div>
-
-        <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2">
+        <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2" >
             <select
                     #language="ngModel"
                     [disabled]="model.readOnly"
@@ -36,32 +32,41 @@
                 <option *ngFor="let lang of model.languageCodes" [value]="lang.code">{{lang.display}}</option>
             </select>
         </div>
-
-        <div *ngIf="hasRelationLookup" class="col-auto text-center">
+        <div *ngIf="isRelationship" class="col-auto text-center" [class.invisible]="context?.index > 0">
             <button class="btn btn-secondary"
-                    type="submit"
+                    type="button"
                     ngbTooltip="{{'form.lookup-help' | translate}}"
                     placement="top"
                     (click)="openLookup(); $event.stopPropagation();">{{'form.lookup' | translate}}
             </button>
         </div>
     </div>
-
     <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: model"></ng-container>
-
+    <ng-container *ngIf="value?.isVirtual">
+        <ds-existing-metadata-list-element
+                *ngIf="model.hasSelectableMetadata"
+                [reoRel]="relationshipValue$ | async"
+                [submissionItem]="item$ | async"
+                [listId]="listId"
+                [metadataFields]="model.metadataFields"
+                [submissionId]="model.submissionId"
+                [relationshipOptions]="model.relationship"
+                (remove)="onRemove()"
+        >
+        </ds-existing-metadata-list-element>
+        <ds-existing-relation-list-element
+                *ngIf="!model.hasSelectableMetadata"
+                [ngClass]="{'d-block pb-2 pt-2': !context?.index}"
+                [reoRel]="relationshipValue$ | async"
+                [submissionItem]="item$ | async"
+                [listId]="listId"
+                [metadataFields]="model.metadataFields"
+                [submissionId]="model.submissionId"
+                [relationshipOptions]="model.relationship"
+        >
+        </ds-existing-relation-list-element>
+    </ng-container>
     <ng-content></ng-content>
+</div>
 
 
-    <div *ngIf="hasRelationLookup" class="mt-3">
-        <ul class="list-unstyled" cdkDropList (cdkDropListDropped)="moveSelection($event)">
-            <ds-existing-metadata-list-element cdkDrag
-                                               *ngFor="let reorderable of reorderables; trackBy: trackReorderable"
-                                               [reoRel]="reorderable"
-                                               [submissionItem]="item"
-                                               [listId]="listId"
-                                               [metadataFields]="model.metadataFields"
-                                               [relationshipOptions]="model.relationship">
-            </ds-existing-metadata-list-element>
-        </ul>
-    </div>
-</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 4dee6905d2e..0a4de25ebff 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -44,15 +44,15 @@ import { SharedModule } from '../../../shared.module';
 import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model';
 import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
 import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
-import { AuthorityOptions } from '../../../../core/integration/models/authority-options.model';
+import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
 import { DynamicLookupModel } from './models/lookup/dynamic-lookup.model';
 import { DynamicScrollableDropdownModel } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { DynamicTagModel } from './models/tag/dynamic-tag.model';
-import { DynamicTypeaheadModel } from './models/typeahead/dynamic-typeahead.model';
+import { DynamicOneboxModel } from './models/onebox/dynamic-onebox.model';
 import { DynamicQualdropModel } from './models/ds-dynamic-qualdrop.model';
 import { DynamicLookupNameModel } from './models/lookup/dynamic-lookup-name.model';
-import { DsDynamicTypeaheadComponent } from './models/typeahead/dynamic-typeahead.component';
+import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
 import { DsDynamicListComponent } from './models/list/dynamic-list.component';
@@ -71,14 +71,15 @@ import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
 import { of as observableOf } from 'rxjs';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { FormService } from '../../form.service';
+import { SubmissionService } from '../../../../submission/submission.service';
+import { FormBuilderService } from '../form-builder.service';
 
 describe('DsDynamicFormControlContainerComponent test suite', () => {
 
-  const authorityOptions: AuthorityOptions = {
-    closed: false,
-    metadata: 'list',
+  const vocabularyOptions: VocabularyOptions = {
     name: 'type_programme',
-    scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
+    closed: false
   };
   const formModel = [
     new DynamicCheckboxModel({ id: 'checkbox' }),
@@ -101,23 +102,24 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     new DynamicSwitchModel({ id: 'switch' }),
     new DynamicTextAreaModel({ id: 'textarea' }),
     new DynamicTimePickerModel({ id: 'timepicker' }),
-    new DynamicTypeaheadModel({ id: 'typeahead', metadataFields: [], repeatable: false, submissionId: '1234' }),
+    new DynamicOneboxModel({ id: 'typeahead', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false }),
     new DynamicScrollableDropdownModel({
       id: 'scrollableDropdown',
-      authorityOptions: authorityOptions,
+      vocabularyOptions: vocabularyOptions,
       metadataFields: [],
       repeatable: false,
-      submissionId: '1234'
+      submissionId: '1234',
+      hasSelectableMetadata: false
     }),
-    new DynamicTagModel({ id: 'tag', metadataFields: [], repeatable: false, submissionId: '1234' }),
+    new DynamicTagModel({ id: 'tag', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false }),
     new DynamicListCheckboxGroupModel({
       id: 'checkboxList',
-      authorityOptions: authorityOptions,
+      vocabularyOptions: vocabularyOptions,
       repeatable: true
     }),
     new DynamicListRadioGroupModel({
       id: 'radioList',
-      authorityOptions: authorityOptions,
+      vocabularyOptions: vocabularyOptions,
       repeatable: false
     }),
     new DynamicRelationGroupModel({
@@ -130,11 +132,12 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       scopeUUID: '',
       submissionScope: '',
       repeatable: false,
-      metadataFields: []
+      metadataFields: [],
+      hasSelectableMetadata: false
     }),
     new DynamicDsDatePickerModel({ id: 'datepicker' }),
-    new DynamicLookupModel({ id: 'lookup', metadataFields: [], repeatable: false, submissionId: '1234' }),
-    new DynamicLookupNameModel({ id: 'lookupName', metadataFields: [], repeatable: false, submissionId: '1234' }),
+    new DynamicLookupModel({ id: 'lookup', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false }),
+    new DynamicLookupNameModel({ id: 'lookupName', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false}),
     new DynamicQualdropModel({ id: 'combobox', readOnly: false, required: false })
   ];
   const testModel = formModel[8];
@@ -175,6 +178,9 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
         { provide: Store, useValue: {} },
         { provide: RelationshipService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
+        { provide: FormService, useValue: {} },
+        { provide: FormBuilderService, useValue: {} },
+        { provide: SubmissionService, useValue: {} },
         {
           provide: SubmissionObjectDataService,
           useValue: {
@@ -220,7 +226,6 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     expect(component.group instanceof FormGroup).toBe(true);
     expect(component.model instanceof DynamicFormControlModel).toBe(true);
     expect(component.hasErrorMessaging).toBe(false);
-    expect(component.asBootstrapFormGroup).toBe(true);
 
     expect(component.onControlValueChanges).toBeDefined();
     expect(component.onModelDisabledUpdates).toBeDefined();
@@ -312,7 +317,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     expect(testFn(formModel[13])).toBeNull();
     expect(testFn(formModel[14])).toEqual(DynamicNGBootstrapTextAreaComponent);
     expect(testFn(formModel[15])).toEqual(DynamicNGBootstrapTimePickerComponent);
-    expect(testFn(formModel[16])).toEqual(DsDynamicTypeaheadComponent);
+    expect(testFn(formModel[16])).toEqual(DsDynamicOneboxComponent);
     expect(testFn(formModel[17])).toEqual(DsDynamicScrollableDropdownComponent);
     expect(testFn(formModel[18])).toEqual(DsDynamicTagComponent);
     expect(testFn(formModel[19])).toEqual(DsDynamicListComponent);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 2089ce8bcac..261189170d3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -1,5 +1,6 @@
 import {
-  ChangeDetectionStrategy, ChangeDetectorRef,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ComponentFactoryResolver,
   ContentChildren,
@@ -16,7 +17,7 @@ import {
   ViewChild,
   ViewContainerRef
 } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { FormArray, FormGroup } from '@angular/forms';
 
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
@@ -29,13 +30,18 @@ import {
   DYNAMIC_FORM_CONTROL_TYPE_SELECT,
   DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA,
   DYNAMIC_FORM_CONTROL_TYPE_TIMEPICKER,
-  DynamicDatePickerModel, DynamicFormComponentService,
+  DynamicDatePickerModel,
+  DynamicFormArrayGroupModel,
+  DynamicFormArrayModel,
+  DynamicFormComponentService,
   DynamicFormControl,
   DynamicFormControlContainerComponent,
   DynamicFormControlEvent,
+  DynamicFormControlEventType,
   DynamicFormControlModel,
   DynamicFormLayout,
-  DynamicFormLayoutService, DynamicFormRelationService,
+  DynamicFormLayoutService,
+  DynamicFormRelationService,
   DynamicFormValidationService,
   DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
@@ -50,36 +56,31 @@ import {
   DynamicNGBootstrapTimePickerComponent
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { followLink } from '../../../utils/follow-link-config.model';
-import {
-  Reorderable,
-  ReorderableRelationship
-} from './existing-metadata-list-element/existing-metadata-list-element.component';
+import { ReorderableRelationship } from './existing-metadata-list-element/existing-metadata-list-element.component';
 
-import { DYNAMIC_FORM_CONTROL_TYPE_TYPEAHEAD } from './models/typeahead/dynamic-typeahead.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_ONEBOX } from './models/onebox/dynamic-onebox.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP } from './models/lookup/dynamic-lookup.model';
 import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
-import { hasValue, isNotEmpty, isNotUndefined } from '../../../empty.util';
+import { hasNoValue, hasValue, isNotEmpty, isNotUndefined } from '../../../empty.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME } from './models/lookup/dynamic-lookup-name.model';
 import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
 import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
 import { DsDynamicListComponent } from './models/list/dynamic-list.component';
-import { DsDynamicTypeaheadComponent } from './models/typeahead/dynamic-typeahead.component';
+import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './models/relation-group/dynamic-relation-group.model';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
 import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component';
-import { map, startWith, switchMap, find } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import { find, map, startWith, switchMap, take } from 'rxjs/operators';
+import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { SearchResult } from '../../../search/search-result.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
@@ -88,7 +89,13 @@ import { SelectableListService } from '../../../object-list/selectable-list/sele
 import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model';
 import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { getAllSucceededRemoteData, getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
+import {
+  getAllSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData
+} from '../../../../core/shared/operators';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Item } from '../../../../core/shared/item.model';
 import { ItemDataService } from '../../../../core/data/item-data.service';
@@ -96,11 +103,20 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../app.reducer';
 import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { SubmissionObject } from '../../../../core/submission/models/submission-object.model';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Collection } from '../../../../core/shared/collection.model';
+import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../../core/shared/metadata.models';
+import { FormService } from '../../form.service';
+import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer';
+import { SubmissionService } from '../../../../submission/submission.service';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { paginatedRelationsToItems } from '../../../../+item-page/simple/item-types/shared/item-relationships-utils';
+import { RelationshipOptions } from '../models/relationship-options.model';
+import { FormBuilderService } from '../form-builder.service';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 
 export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<DynamicFormControl> | null {
   switch (model.type) {
@@ -136,8 +152,8 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
     case DYNAMIC_FORM_CONTROL_TYPE_TIMEPICKER:
       return DynamicNGBootstrapTimePickerComponent;
 
-    case DYNAMIC_FORM_CONTROL_TYPE_TYPEAHEAD:
-      return DsDynamicTypeaheadComponent;
+    case DYNAMIC_FORM_CONTROL_TYPE_ONEBOX:
+      return DsDynamicOneboxComponent;
 
     case DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN:
       return DsDynamicScrollableDropdownComponent;
@@ -180,22 +196,22 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
 
   @Input() formId: string;
-  @Input() asBootstrapFormGroup = true;
+  @Input() asBootstrapFormGroup = false;
   @Input() bindId = true;
   @Input() context: any | null = null;
   @Input() group: FormGroup;
   @Input() hasErrorMessaging = false;
   @Input() layout = null as DynamicFormLayout;
   @Input() model: any;
-  reorderables$: Observable<ReorderableRelationship[]>;
-  reorderables: ReorderableRelationship[];
-  hasRelationLookup: boolean;
+  relationshipValue$: Observable<ReorderableRelationship>;
+  isRelationship: boolean;
   modalRef: NgbModalRef;
   item: Item;
+  item$: Observable<Item>;
   collection: Collection;
   listId: string;
   searchConfig: string;
-
+  value: MetadataValue;
   /**
    * List of subscriptions to unsubscribe from
    */
@@ -207,7 +223,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   /* tslint:enable:no-output-rename */
-  @ViewChild('componentViewContainer', { read: ViewContainerRef, static: true}) componentViewContainerRef: ViewContainerRef;
+  @ViewChild('componentViewContainer', { read: ViewContainerRef, static: true }) componentViewContainerRef: ViewContainerRef;
 
   private showErrorMessagesPreviousStage: boolean;
 
@@ -229,9 +245,11 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     private zone: NgZone,
     private store: Store<AppState>,
     private submissionObjectService: SubmissionObjectDataService,
-    private ref: ChangeDetectorRef
+    private ref: ChangeDetectorRef,
+    private formService: FormService,
+    private formBuilderService: FormBuilderService,
+    private submissionService: SubmissionService
   ) {
-
     super(componentFactoryResolver, layoutService, validationService, dynamicFormComponentService, relationService);
   }
 
@@ -239,62 +257,77 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
    * Sets up the necessary variables for when this control can be used to add relationships to the submitted item
    */
   ngOnInit(): void {
-    this.hasRelationLookup = hasValue(this.model.relationship);
-    this.reorderables = [];
-    if (this.hasRelationLookup) {
-
-      this.listId = 'list-' + this.model.relationship.relationshipType;
-
-      const submissionObject$ = this.submissionObjectService
-        .findById(this.model.submissionId, followLink('item'), followLink('collection')).pipe(
-          getAllSucceededRemoteData(),
-          getRemoteDataPayload()
-        );
+    this.isRelationship = hasValue(this.model.relationship);
+    const isWrapperAroundRelationshipList = hasValue(this.model.relationshipConfig);
+
+    if (this.isRelationship || isWrapperAroundRelationshipList) {
+      const config = this.model.relationshipConfig || this.model.relationship;
+      const relationshipOptions = Object.assign(new RelationshipOptions(), config);
+      this.listId = `list-${this.model.submissionId}-${relationshipOptions.relationshipType}`;
+      this.setItem();
+
+      if (isWrapperAroundRelationshipList || !this.model.repeatable) {
+        const subscription = this.selectableListService.getSelectableList(this.listId).pipe(
+          find((list: SelectableListState) => hasNoValue(list)),
+          switchMap(() => this.item$.pipe(take(1))),
+          switchMap((item) => {
+            const relationshipsRD$ = this.relationshipService.getItemRelationshipsByLabel(item,
+              relationshipOptions.relationshipType,
+              undefined,
+              true,
+              followLink('leftItem'),
+              followLink('rightItem'),
+              followLink('relationshipType')
+            );
+
+            relationshipsRD$.pipe(
+              getFirstSucceededRemoteDataPayload(),
+              getPaginatedListPayload()
+            ).subscribe((relationships: Relationship[]) => {
+              // set initial namevariants for pre-existing relationships
+              relationships.forEach((relationship: Relationship) => {
+                const relationshipMD: MetadataValue = item.firstMetadata(relationshipOptions.metadataField, { authority: `${VIRTUAL_METADATA_PREFIX}${relationship.id}` });
+                const nameVariantMD: MetadataValue = item.firstMetadata(this.model.metadataFields, { authority: `${VIRTUAL_METADATA_PREFIX}${relationship.id}` });
+                if (hasValue(relationshipMD) && isNotEmpty(relationshipMD.value) && hasValue(nameVariantMD) && isNotEmpty(nameVariantMD.value)) {
+                  this.relationshipService.setNameVariant(this.listId, relationshipMD.value, nameVariantMD.value);
+                }
+              });
+            });
+
+            return relationshipsRD$.pipe(
+              paginatedRelationsToItems(item.uuid),
+              getFirstSucceededRemoteData(),
+              map((items: RemoteData<PaginatedList<Item>>) => items.payload.page.map((i) => Object.assign(new ItemSearchResult(), { indexableObject: i }))),
+            )
+          })
+        ).subscribe((relatedItems: Array<SearchResult<Item>>) => this.selectableListService.select(this.listId, relatedItems));
+        this.subs.push(subscription);
+      }
 
-      const item$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload())));
-      const collection$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.collection as Observable<RemoteData<Collection>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload())));
+      if (hasValue(this.model.metadataValue)) {
+        this.value = Object.assign(new FormFieldMetadataValueObject(), this.model.metadataValue);
+      } else {
+        this.value = Object.assign(new FormFieldMetadataValueObject(), this.model.value);
+      }
 
-      this.subs.push(item$.subscribe((item) => this.item = item));
-      this.subs.push(collection$.subscribe((collection) => this.collection = collection));
-      this.reorderables$ = item$.pipe(
-        switchMap((item) => this.relationshipService.getItemRelationshipsByLabel(item, this.model.relationship.relationshipType, undefined, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType'))
+      if (hasValue(this.value) && this.value.isVirtual) {
+        const relationship$ = this.relationshipService.findById(this.value.virtualValue, true, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType'))
           .pipe(
             getAllSucceededRemoteData(),
-            getRemoteDataPayload(),
-            map((relationshipList: PaginatedList<Relationship>) => relationshipList.page),
-            startWith([]),
-            switchMap((relationships: Relationship[]) =>
-              observableCombineLatest(
-                relationships.map((relationship: Relationship) =>
-                  relationship.leftItem.pipe(
-                    getSucceededRemoteData(),
-                    getRemoteDataPayload(),
-                    map((leftItem: Item) => {
-                      return new ReorderableRelationship(relationship, leftItem.uuid !== this.item.uuid)
-                    }),
-                  )
-                ))),
-            map((relationships: ReorderableRelationship[]) =>
-              relationships
-                .sort((a: Reorderable, b: Reorderable) => {
-                  return Math.sign(a.getPlace() - b.getPlace());
-                })
+            getRemoteDataPayload());
+        this.relationshipValue$ = observableCombineLatest([this.item$.pipe(take(1)), relationship$]).pipe(
+          switchMap(([item, relationship]: [Item, Relationship]) =>
+            relationship.leftItem.pipe(
+              getAllSucceededRemoteData(),
+              getRemoteDataPayload(),
+              map((leftItem: Item) => {
+                return new ReorderableRelationship(relationship, leftItem.uuid !== item.uuid, this.relationshipService, this.store, this.model.submissionId)
+              }),
             )
-          )
-        )
-      );
-
-      this.subs.push(this.reorderables$.subscribe((rs) => {
-        this.reorderables = rs;
-        this.ref.detectChanges();
-      }));
-
-      item$.pipe(
-        switchMap((item) => this.relationshipService.getRelatedItemsByLabel(item, this.model.relationship.relationshipType)),
-        map((items: RemoteData<PaginatedList<Item>>) => items.payload.page.map((item) => Object.assign(new ItemSearchResult(), { indexableObject: item }))),
-      ).subscribe((relatedItems: Array<SearchResult<Item>>) => {
-        this.selectableListService.select(this.listId, relatedItems)
-      });
+          ),
+          startWith(undefined)
+        );
+      }
     }
   }
 
@@ -303,7 +336,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   }
 
   ngOnChanges(changes: SimpleChanges) {
-    if (changes) {
+    if (changes && !this.isRelationship && hasValue(this.group.get(this.model.id))) {
       super.ngOnChanges(changes);
       if (this.model && this.model.placeholder) {
         this.model.placeholder = this.translateService.instant(this.model.placeholder);
@@ -351,39 +384,46 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
       size: 'lg'
     });
     const modalComp = this.modalRef.componentInstance;
+
+    if (hasValue(this.model.value) && !this.model.readOnly) {
+      if (typeof this.model.value === 'string') {
+        modalComp.query = this.model.value;
+      } else if (typeof this.model.value.value === 'string') {
+        modalComp.query = this.model.value.value;
+      }
+    }
+
+    if (hasValue(this.model.value)) {
+      this.model.value = '';
+      this.onChange({
+        $event: { previousIndex: 0 },
+        context: { index: 0 },
+        control: this.control,
+        model: this.model,
+        type: DynamicFormControlEventType.Change
+      });
+    }
+    this.submissionService.dispatchSave(this.model.submissionId);
+
     modalComp.repeatable = this.model.repeatable;
     modalComp.listId = this.listId;
     modalComp.relationshipOptions = this.model.relationship;
-    modalComp.label = this.model.label;
+    modalComp.label = this.model.relationship.relationshipType;
     modalComp.metadataFields = this.model.metadataFields;
     modalComp.item = this.item;
     modalComp.collection = this.collection;
+    modalComp.submissionId = this.model.submissionId;
   }
 
   /**
-   * Method to move a relationship inside the list of relationships
-   * This will update the view and update the right or left place field of the relationships in the list
-   * @param event
+   * Callback for the remove event,
+   * remove the current control from its array
    */
-  moveSelection(event: CdkDragDrop<Relationship>) {
-    this.zone.runOutsideAngular(() => {
-      moveItemInArray(this.reorderables, event.previousIndex, event.currentIndex);
-      const reorderables: Reorderable[] = this.reorderables.map((reo: Reorderable, index: number) => {
-          reo.oldIndex = reo.getPlace();
-          reo.newIndex = index;
-          return reo;
-        }
-      );
-      observableCombineLatest(
-        reorderables.map((rel: ReorderableRelationship) => {
-          if (rel.oldIndex !== rel.newIndex) {
-            return this.relationshipService.updatePlace(rel);
-          } else {
-            return observableOf(undefined) as Observable<RemoteData<Relationship>>;
-          }
-        })
-      ).subscribe();
-    })
+  onRemove(): void {
+    const arrayContext: DynamicFormArrayModel = (this.context as DynamicFormArrayGroupModel).context;
+    const path = this.formBuilderService.getPath(arrayContext);
+    const formArrayControl = this.group.root.get(path) as FormArray;
+    this.formBuilderService.removeFormArrayGroup(this.context.index, formArrayControl, arrayContext);
   }
 
   /**
@@ -396,9 +436,20 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   }
 
   /**
-   * Prevent unnecessary rerendering so fields don't lose focus
+   *  Initialize this.item$ based on this.model.submissionId
    */
-  trackReorderable(index, reorderable: Reorderable) {
-    return hasValue(reorderable) ? reorderable.getId() : undefined;
+  private setItem() {
+    const submissionObject$ = this.submissionObjectService
+      .findById(this.model.submissionId, true, followLink('item'), followLink('collection')).pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload()
+      );
+
+    this.item$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload())));
+    const collection$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.collection as Observable<RemoteData<Collection>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload())));
+
+    this.subs.push(this.item$.subscribe((item) => this.item = item));
+    this.subs.push(collection$.subscribe((collection) => this.collection = collection));
+
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
index 4d8123a4b9f..5684f4eac97 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
@@ -7,6 +7,7 @@
                                    [model]="model"
                                    [ngClass]="[getClass(model, 'element', 'host'), getClass(model, 'grid', 'host')]"
                                    [templates]="templates"
+                                   [asBootstrapFormGroup]="true"
                                    (dfBlur)="onEvent($event, 'blur')"
                                    (dfChange)="onEvent($event, 'change')"
                                    (dfFocus)="onEvent($event, 'focus')"></ds-dynamic-form-control-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
index 490275a03b0..ad1c18706d8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
@@ -37,5 +37,4 @@ export class DsDynamicFormComponent extends DynamicFormComponent {
   constructor(protected formService: FormBuilderService, protected layoutService: DynamicFormLayoutService) {
     super(formService, layoutService);
   }
-
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 960dd78767f..57ab7d66d80 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,11 +1,14 @@
-<li *ngIf="metadataRepresentation">
-    <button type="button" class="close float-left" aria-label="Move button" cdkDragHandle>
-        <i aria-hidden="true" class="fas fa-arrows-alt fa-xs"></i>
+<div class="d-flex">
+    <span class="mr-auto text-contents">
+        <ng-container *ngIf="!(metadataRepresentation$ | async)">
+            <ds-loading [showMessage]="false"></ds-loading>
+        </ng-container>
+        <ng-container *ngIf="(metadataRepresentation$ | async)">
+            <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation$ | async"></ds-metadata-representation-loader>
+        </ng-container>
+    </span>
+    <button type="button" class="btn btn-secondary"
+            (click)="removeSelection()">
+        <i class="fas fa-trash" aria-hidden="true"></i>
     </button>
-    <button type="button" class="close float-left" aria-label="Close button" (click)="removeSelection()">
-        <span aria-hidden="true">&times;</span>
-    </button>
-    <span class="d-inline-block align-middle ml-1">
-              <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation"></ds-metadata-representation-loader>
-          </span>
-</li>
+</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
index e69de29bb2d..ab63e324bde 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
@@ -0,0 +1,3 @@
+span.text-contents{
+    padding: $btn-padding-y 0;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
index 79a650b597c..930dfe83d95 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
@@ -1,15 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ExistingMetadataListElementComponent, Reorderable, ReorderableRelationship } from './existing-metadata-list-element.component';
+import {
+  ExistingMetadataListElementComponent,
+  ReorderableRelationship
+} from './existing-metadata-list-element.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { select, Store } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { Item } from '../../../../../core/shared/item.model';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { of as observableOf } from 'rxjs';
 
 describe('ExistingMetadataListElementComponent', () => {
   let component: ExistingMetadataListElementComponent;
@@ -28,6 +32,8 @@ describe('ExistingMetadataListElementComponent', () => {
   let leftItemRD$;
   let rightItemRD$;
   let relatedSearchResult;
+  let submissionId;
+  let relationshipService;
 
   function init() {
     uuid1 = '91ce578d-2e63-4093-8c73-3faafd716000';
@@ -42,9 +48,13 @@ describe('ExistingMetadataListElementComponent', () => {
     leftItemRD$ = createSuccessfulRemoteDataObject$(relatedItem);
     rightItemRD$ = createSuccessfulRemoteDataObject$(submissionItem);
     relatedSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: relatedItem });
+    relationshipService = {
+      updatePlace:() => observableOf({})
+    } as any;
 
     relationship = Object.assign(new Relationship(), { leftItem: leftItemRD$, rightItem: rightItemRD$ });
-    reoRel = new ReorderableRelationship(relationship, true);
+    submissionId = '1234';
+    reoRel = new ReorderableRelationship(relationship, true, {} as any, {} as any, submissionId);
   }
 
   beforeEach(async(() => {
@@ -68,6 +78,7 @@ describe('ExistingMetadataListElementComponent', () => {
     component.reoRel = reoRel;
     component.metadataFields = metadataFields;
     component.relationshipOptions = relationshipOptions;
+    component.submissionId = submissionId;
     fixture.detectChanges();
     component.ngOnChanges();
   });
@@ -84,9 +95,8 @@ describe('ExistingMetadataListElementComponent', () => {
 
     it('should dispatch a RemoveRelationshipAction', () => {
       component.removeSelection();
-      const action = new RemoveRelationshipAction(submissionItem, relatedItem, relationshipOptions.relationshipType);
+      const action = new RemoveRelationshipAction(submissionItem, relatedItem, relationshipOptions.relationshipType, submissionId);
       expect(store.dispatch).toHaveBeenCalledWith(action);
-
     });
   })
 });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
index 09aaa253c69..678402a1bce 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
@@ -1,50 +1,126 @@
-import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { DynamicFormArrayGroupModel } from '@ng-dynamic-forms/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { AppState } from '../../../../../app.reducer';
+import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ItemMetadataRepresentation } from '../../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { MetadataRepresentation } from '../../../../../core/shared/metadata-representation/metadata-representation.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
 import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
 import { hasValue, isNotEmpty } from '../../../../empty.util';
-import { Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { ItemMetadataRepresentation } from '../../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
+import { DynamicConcatModel } from '../models/ds-dynamic-concat.model';
 import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../../../app.reducer';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 
 // tslint:disable:max-classes-per-file
 /**
  * Abstract class that defines objects that can be reordered
  */
 export abstract class Reorderable {
+
   constructor(public oldIndex?: number, public newIndex?: number) {
   }
 
+  /**
+   * Return the id for this Reorderable
+   */
   abstract getId(): string;
 
+  /**
+   * Return the place metadata for this Reorderable
+   */
   abstract getPlace(): number;
+
+  /**
+   * Update the Reorderable
+   */
+  update(): void {
+    this.oldIndex = this.newIndex;
+  }
+
+  /**
+   * Returns true if the oldIndex of this Reorderable
+   * differs from the newIndex
+   */
+  get hasMoved(): boolean {
+    return this.oldIndex !== this.newIndex
+  }
+}
+
+/**
+ * A Reorderable representation of a FormFieldMetadataValue
+ */
+export class ReorderableFormFieldMetadataValue extends Reorderable {
+
+  constructor(
+    public metadataValue: FormFieldMetadataValueObject,
+    public model: DynamicConcatModel,
+    public control: FormControl,
+    public group: DynamicFormArrayGroupModel,
+    oldIndex?: number,
+    newIndex?: number
+  ) {
+    super(oldIndex, newIndex);
+    this.metadataValue = metadataValue;
+  }
+
+  /**
+   * Return the id for this Reorderable
+   */
+  getId(): string {
+    if (hasValue(this.metadataValue.authority)) {
+      return this.metadataValue.authority;
+    } else {
+      // can't use UUIDs, they're generated client side
+      return this.metadataValue.value;
+    }
+  }
+
+  /**
+   * Return the place metadata for this Reorderable
+   */
+  getPlace(): number {
+    return this.metadataValue.place;
+  }
+
 }
 
 /**
  * Represents a single relationship that can be reordered in a list of multiple relationships
  */
 export class ReorderableRelationship extends Reorderable {
-  relationship: Relationship;
-  useLeftItem: boolean;
 
-  constructor(relationship: Relationship, useLeftItem: boolean, oldIndex?: number, newIndex?: number) {
+  constructor(
+    public relationship: Relationship,
+    public useLeftItem: boolean,
+    protected relationshipService: RelationshipService,
+    protected store: Store<AppState>,
+    protected submissionID: string,
+    oldIndex?: number,
+    newIndex?: number) {
     super(oldIndex, newIndex);
     this.relationship = relationship;
     this.useLeftItem = useLeftItem;
   }
 
+  /**
+   * Return the id for this Reorderable
+   */
   getId(): string {
     return this.relationship.id;
   }
 
+  /**
+   * Return the place metadata for this Reorderable
+   */
   getPlace(): number {
     if (this.useLeftItem) {
       return this.relationship.rightPlace
@@ -62,15 +138,16 @@ export class ReorderableRelationship extends Reorderable {
   templateUrl: './existing-metadata-list-element.component.html',
   styleUrls: ['./existing-metadata-list-element.component.scss']
 })
-export class ExistingMetadataListElementComponent implements OnChanges, OnDestroy {
+export class ExistingMetadataListElementComponent implements OnInit, OnChanges, OnDestroy   {
   @Input() listId: string;
   @Input() submissionItem: Item;
   @Input() reoRel: ReorderableRelationship;
   @Input() metadataFields: string[];
   @Input() relationshipOptions: RelationshipOptions;
-  metadataRepresentation: MetadataRepresentation;
+  @Input() submissionId: string;
+  metadataRepresentation$: BehaviorSubject<MetadataRepresentation> = new BehaviorSubject<MetadataRepresentation>(undefined);
   relatedItem: Item;
-
+  @Output() remove: EventEmitter<any> = new EventEmitter();
   /**
    * List of subscriptions to unsubscribe from
    */
@@ -82,24 +159,35 @@ export class ExistingMetadataListElementComponent implements OnChanges, OnDestro
   ) {
   }
 
+  ngOnInit(): void {
+    this.ngOnChanges();
+  }
+
+  /**
+   * Change callback for the component
+   */
   ngOnChanges() {
-    const item$ = this.reoRel.useLeftItem ?
-      this.reoRel.relationship.leftItem : this.reoRel.relationship.rightItem;
-    this.subs.push(item$.pipe(
-      getAllSucceededRemoteData(),
-      getRemoteDataPayload(),
-      filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
-    ).subscribe((item: Item) => {
-      this.relatedItem = item;
-      const relationMD: MetadataValue = this.submissionItem.firstMetadata(this.relationshipOptions.metadataField, { value: this.relatedItem.uuid });
-      if (hasValue(relationMD)) {
-        const metadataRepresentationMD: MetadataValue = this.submissionItem.firstMetadata(this.metadataFields, { authority: relationMD.authority });
-        this.metadataRepresentation = Object.assign(
-          new ItemMetadataRepresentation(metadataRepresentationMD),
-          this.relatedItem
-        )
-      }
-    }));
+    if (hasValue(this.reoRel)) {
+      const item$ = this.reoRel.useLeftItem ?
+        this.reoRel.relationship.leftItem : this.reoRel.relationship.rightItem;
+      this.subs.push(item$.pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload(),
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+      ).subscribe((item: Item) => {
+        this.relatedItem = item;
+        const relationMD: MetadataValue = this.submissionItem.firstMetadata(this.relationshipOptions.metadataField, { value: this.relatedItem.uuid });
+        if (hasValue(relationMD)) {
+          const metadataRepresentationMD: MetadataValue = this.submissionItem.firstMetadata(this.metadataFields, { authority: relationMD.authority });
+
+          const nextValue = Object.assign(
+            new ItemMetadataRepresentation(metadataRepresentationMD),
+            this.relatedItem
+          );
+          this.metadataRepresentation$.next(nextValue);
+        }
+      }));
+    }
   }
 
   /**
@@ -107,7 +195,8 @@ export class ExistingMetadataListElementComponent implements OnChanges, OnDestro
    */
   removeSelection() {
     this.selectableListService.deselectSingle(this.listId, Object.assign(new ItemSearchResult(), { indexableObject: this.relatedItem }));
-    this.store.dispatch(new RemoveRelationshipAction(this.submissionItem, this.relatedItem, this.relationshipOptions.relationshipType))
+    this.store.dispatch(new RemoveRelationshipAction(this.submissionItem, this.relatedItem, this.relationshipOptions.relationshipType, this.submissionId));
+    this.remove.emit();
   }
 
   /**
@@ -120,4 +209,5 @@ export class ExistingMetadataListElementComponent implements OnChanges, OnDestro
   }
 
 }
+
 // tslint:enable:max-classes-per-file
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
new file mode 100644
index 00000000000..15087d25531
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -0,0 +1,14 @@
+<div class="d-flex">
+    <span class="mr-auto text-contents">
+        <ng-container *ngIf="!(relatedItem$ | async)">
+            <ds-loading [showMessage]="false"></ds-loading>
+        </ng-container>
+        <ng-container *ngIf="(relatedItem$ | async)">
+            <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
+        </ng-container>
+    </span>
+    <button type="button" class="btn btn-secondary"
+            (click)="removeSelection()">
+        <i class="fas fa-trash" aria-hidden="true"></i>
+    </button>
+</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.scss
new file mode 100644
index 00000000000..ab63e324bde
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.scss
@@ -0,0 +1,3 @@
+span.text-contents{
+    padding: $btn-padding-y 0;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
new file mode 100644
index 00000000000..a337dd480ed
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
@@ -0,0 +1,100 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ExistingRelationListElementComponent } from './existing-relation-list-element.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { Store } from '@ngrx/store';
+import { Item } from '../../../../../core/shared/item.model';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { of as observableOf } from 'rxjs';
+import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+
+describe('ExistingRelationListElementComponent', () => {
+  let component: ExistingRelationListElementComponent;
+  let fixture: ComponentFixture<ExistingRelationListElementComponent>;
+  let selectionService;
+  let store;
+  let listID;
+  let submissionItem;
+  let relationship;
+  let reoRel;
+  let metadataFields;
+  let relationshipOptions;
+  let uuid1;
+  let uuid2;
+  let relatedItem;
+  let leftItemRD$;
+  let rightItemRD$;
+  let relatedSearchResult;
+  let submissionId;
+  let relationshipService;
+
+  function init() {
+    uuid1 = '91ce578d-2e63-4093-8c73-3faafd716000';
+    uuid2 = '0e9dba1c-e1c3-4e05-a539-446f08ef57a7';
+    selectionService = jasmine.createSpyObj('selectionService', ['deselectSingle']);
+    store = jasmine.createSpyObj('store', ['dispatch']);
+    listID = '1234-listID';
+    submissionItem = Object.assign(new Item(), { uuid: uuid1 });
+    metadataFields = ['dc.contributor.author'];
+    relationshipOptions = Object.assign(new RelationshipOptions(), { relationshipType: 'isPublicationOfAuthor', filter: 'test.filter', searchConfiguration: 'personConfiguration', nameVariants: true })
+    relatedItem = Object.assign(new Item(), { uuid: uuid2 });
+    leftItemRD$ = createSuccessfulRemoteDataObject$(relatedItem);
+    rightItemRD$ = createSuccessfulRemoteDataObject$(submissionItem);
+    relatedSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: relatedItem });
+    relationshipService = {
+      updatePlace:() => observableOf({})
+    } as any;
+
+    relationship = Object.assign(new Relationship(), { leftItem: leftItemRD$, rightItem: rightItemRD$ });
+    submissionId = '1234';
+    reoRel = new ReorderableRelationship(relationship, true, relationshipService, {} as any, submissionId);
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [ExistingRelationListElementComponent],
+      providers: [
+        { provide: SelectableListService, useValue: selectionService },
+        { provide: Store, useValue: store },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ExistingRelationListElementComponent);
+    component = fixture.componentInstance;
+    component.listId = listID;
+    component.submissionItem = submissionItem;
+    component.reoRel = reoRel;
+    component.metadataFields = metadataFields;
+    component.relationshipOptions = relationshipOptions;
+    component.submissionId = submissionId;
+    fixture.detectChanges();
+    component.ngOnChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('removeSelection', () => {
+    it('should deselect the object in the selectable list service', () => {
+      component.removeSelection();
+      expect(selectionService.deselectSingle).toHaveBeenCalledWith(listID, relatedSearchResult);
+    });
+
+    it('should dispatch a RemoveRelationshipAction', () => {
+      component.removeSelection();
+      const action = new RemoveRelationshipAction(submissionItem, relatedItem, relationshipOptions.relationshipType, submissionId);
+      expect(store.dispatch).toHaveBeenCalledWith(action);
+    });
+  })
+});
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
new file mode 100644
index 00000000000..65b37307735
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
@@ -0,0 +1,120 @@
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { AppState } from '../../../../../app.reducer';
+import { Item } from '../../../../../core/shared/item.model';
+import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
+import { hasValue, isNotEmpty } from '../../../../empty.util';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
+
+// tslint:disable:max-classes-per-file
+/**
+ * Abstract class that defines objects that can be reordered
+ */
+export abstract class Reorderable {
+
+  constructor(public oldIndex?: number, public newIndex?: number) {
+  }
+
+  /**
+   * Return the id for this Reorderable
+   */
+  abstract getId(): string;
+
+  /**
+   * Return the place metadata for this Reorderable
+   */
+  abstract getPlace(): number;
+
+  /**
+   * Update the Reorderable
+   */
+  abstract update(): Observable<any>;
+
+  /**
+   * Returns true if the oldIndex of this Reorderable
+   * differs from the newIndex
+   */
+  get hasMoved(): boolean {
+    return this.oldIndex !== this.newIndex
+  }
+}
+
+/**
+ * Represents a single existing relationship value as metadata in submission
+ */
+@Component({
+  selector: 'ds-existing-relation-list-element',
+  templateUrl: './existing-relation-list-element.component.html',
+  styleUrls: ['./existing-relation-list-element.component.scss']
+})
+export class ExistingRelationListElementComponent implements OnInit, OnChanges, OnDestroy {
+  @Input() listId: string;
+  @Input() submissionItem: Item;
+  @Input() reoRel: ReorderableRelationship;
+  @Input() metadataFields: string[];
+  @Input() relationshipOptions: RelationshipOptions;
+  @Input() submissionId: string;
+  relatedItem$: BehaviorSubject<Item> = new BehaviorSubject<Item>(undefined);
+  viewType = ViewMode.ListElement;
+  @Output() remove: EventEmitter<any> = new EventEmitter();
+
+  /**
+   * List of subscriptions to unsubscribe from
+   */
+  private subs: Subscription[] = [];
+
+  constructor(
+    private selectableListService: SelectableListService,
+    private store: Store<AppState>
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.ngOnChanges();
+  }
+
+  /**
+   * Change callback for the component
+   */
+  ngOnChanges() {
+    if (hasValue(this.reoRel)) {
+      const item$ = this.reoRel.useLeftItem ?
+        this.reoRel.relationship.leftItem : this.reoRel.relationship.rightItem;
+      this.subs.push(item$.pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload(),
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+      ).subscribe((item: Item) => {
+        this.relatedItem$.next(item);
+      }));
+    }
+
+  }
+
+  /**
+   * Removes the selected relationship from the list
+   */
+  removeSelection() {
+    this.selectableListService.deselectSingle(this.listId, Object.assign(new ItemSearchResult(), { indexableObject: this.relatedItem$.getValue() }));
+    this.store.dispatch(new RemoveRelationshipAction(this.submissionItem, this.relatedItem$.getValue(), this.relationshipOptions.relationshipType, this.submissionId));
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+}
+
+// tslint:enable:max-classes-per-file
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index 75c27b6ca57..ac5ece93d10 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -1,32 +1,45 @@
 <ng-container [formGroup]="group">
-
     <div [dynamicId]="bindId && model.id"
          [formArrayName]="model.id"
          [ngClass]="getClass('element', 'control')">
-
-        <div *ngFor="let groupModel of model.groups; let idx = index" role="group"
-             [formGroupName]="idx" [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]">
-
-            <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
-
-            <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
-                                               [bindId]="false"
-                                               [context]="groupModel"
-                                               [group]="control.get([idx])"
-                                               [hidden]="_model.hidden"
-                                               [layout]="layout"
-                                               [model]="_model"
-                                               [templates]="templates"
-                                               [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
-                                               (dfBlur)="onBlur($event)"
-                                               (dfChange)="onChange($event)"
-                                               (dfFocus)="onFocus($event)"
-                                               (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
-
-            <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
-
+        <div role="group"
+             formGroupName="0" [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]">
+            <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: model.groups[0]"></ng-container>
+            <ng-container *ngTemplateOutlet="controlContainer; context: {$implicit: 0}"></ng-container>
+            <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: model.groups[0]"></ng-container>
+        </div>
+        <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+            <div *ngFor="let groupModel of model.groups; let idx = index"
+                 [ngClass]="{'pt-2 pb-2': idx > 0}" cdkDrag cdkDragHandle>
+                <div [formGroupName]="idx"
+                     [class]="getClass('element', 'group') + ' ' + getClass('grid', 'group')"
+                     [ngClass]="{'d-flex align-items-center': idx > 0}"
+                >
+                <ng-container *ngIf="idx > 0">
+                    <i class="drag-icon fas fa-grip-vertical fa-fw"></i>
+                    <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
+                    <ng-container *ngTemplateOutlet="controlContainer; context: {$implicit: idx}"></ng-container>
+                    <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
+                </ng-container>
+                </div>
+            </div>
         </div>
-
     </div>
-
 </ng-container>
+
+
+<ng-template #controlContainer let-idx>
+    <ds-dynamic-form-control-container *ngFor="let _model of model.groups[idx].group"
+                                       [bindId]="false"
+                                       [context]="model.groups[idx]"
+                                       [group]="control.get([idx])"
+                                       [hidden]="_model.hidden"
+                                       [layout]="layout"
+                                       [model]="_model"
+                                       [templates]="templates"
+                                       [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
+                                       (dfBlur)="update($event, idx)"
+                                       (dfChange)="update($event, idx)"
+                                       (dfFocus)="onFocus($event)"
+                                       (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
+</ng-template>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
new file mode 100644
index 00000000000..b61bb9232b7
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -0,0 +1,52 @@
+@import './../../../../../../../styles/variables';
+
+:host {
+  display: block;
+}
+
+.cdk-drag {
+    margin-left: -(2 * $spacer);
+    margin-right: -(0.5 * $spacer);
+    padding-right: (0.5 * $spacer);
+    .drag-icon {
+        visibility: hidden;
+        width: (2 * $spacer);
+        color: $gray-600;
+        margin: $btn-padding-y 0;
+        line-height: $btn-line-height;
+        text-indent: 0.5 * $spacer
+    }
+
+    &:hover, &:focus {
+        cursor: grab;
+        .drag-icon {
+            visibility: visible;
+        }
+    }
+
+}
+
+.cdk-drop-list-dragging {
+    .cdk-drag {
+        cursor: grabbing;
+        .drag-icon {
+            visibility: hidden;
+        }
+    }
+}
+
+.cdk-drag-preview {
+    background-color: white;
+    border-radius: $border-radius-sm;
+    margin-left: 0;
+    box-shadow: 0 5px 5px 0px rgba(0, 0, 0, 0.2),
+    0 8px 10px 1px rgba(0, 0, 0, 0.14),
+    0 3px 14px 2px rgba(0, 0, 0, 0.12);
+    .drag-icon {
+        visibility: visible;
+    }
+}
+
+.cdk-drag-placeholder {
+    opacity: 0;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 1e8fd3b55ec..ea6455a138b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -1,25 +1,31 @@
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { Component, EventEmitter, Input, Output, QueryList } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import {
   DynamicFormArrayComponent,
-  DynamicFormArrayModel,
-  DynamicFormControlCustomEvent, DynamicFormControlEvent,
+  DynamicFormControlCustomEvent,
+  DynamicFormControlEvent,
+  DynamicFormControlEventType,
   DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
   DynamicTemplateDirective
 } from '@ng-dynamic-forms/core';
+import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
+import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { hasValue } from '../../../../../empty.util';
 
 @Component({
-    selector: 'ds-dynamic-form-array',
-    templateUrl: './dynamic-form-array.component.html'
+  selector: 'ds-dynamic-form-array',
+  templateUrl: './dynamic-form-array.component.html',
+  styleUrls: ['./dynamic-form-array.component.scss']
 })
 export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
   @Input() bindId = true;
   @Input() group: FormGroup;
   @Input() layout: DynamicFormLayout;
-  @Input() model: DynamicFormArrayModel;
+  @Input() model: DynamicRowArrayModel;
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
 
   /* tslint:disable:no-output-rename */
@@ -27,12 +33,39 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlCustomEvent> = new EventEmitter();
+
   /* tslint:enable:no-output-rename */
 
   constructor(protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService) {
-
+              protected validationService: DynamicFormValidationService,
+  ) {
     super(layoutService, validationService);
   }
 
+  moveSelection(event: CdkDragDrop<Relationship>) {
+    this.model.moveGroup(event.previousIndex, event.currentIndex - event.previousIndex);
+    const prevIndex = event.previousIndex - 1;
+    const index = event.currentIndex - 1;
+
+    if (hasValue(this.model.groups[index]) && hasValue((this.control as any).controls[index])) {
+      const $event = {
+        $event: { previousIndex: prevIndex },
+        context: { index },
+        control: (this.control as any).controls[index],
+        group: this.group,
+        model: this.model.groups[index].group[0],
+        type: DynamicFormControlEventType.Change
+      };
+
+      this.onChange($event);
+      }
+  }
+
+  update(event: any, index: number) {
+    const $event = Object.assign({}, event, {
+      context: { index: index - 1}
+    });
+
+    this.onChange($event)
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index 78c2d5d217e..e08116e5fa0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -8,10 +8,6 @@ import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dyna
 
 import { DsDatePickerComponent } from './date-picker.component';
 import { DynamicDsDatePickerModel } from './date-picker.model';
-import { FormBuilderService } from '../../../form-builder.service';
-
-import { FormComponent } from '../../../../form.component';
-import { FormService } from '../../../../form.service';
 import { createTestComponent } from '../../../../../testing/utils.test';
 
 export const DATE_TEST_GROUP = new FormGroup({
@@ -20,7 +16,7 @@ export const DATE_TEST_GROUP = new FormGroup({
 
 export const DATE_TEST_MODEL_CONFIG = {
   disabled: false,
-  errorMessages: {required: 'You must enter at least the year.'},
+  errorMessages: { required: 'You must enter at least the year.' },
   id: 'date',
   label: 'Date',
   name: 'date',
@@ -52,8 +48,8 @@ describe('DsDatePickerComponent test suite', () => {
       providers: [
         ChangeDetectorRef,
         DsDatePickerComponent,
-        {provide: DynamicFormLayoutService, useValue: {}},
-        {provide: DynamicFormValidationService, useValue: {}}
+        { provide: DynamicFormLayoutService, useValue: {} },
+        { provide: DynamicFormValidationService, useValue: {} }
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 2e22f314ed5..8523c60cf0b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -20,10 +20,6 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   @Input() bindId = true;
   @Input() group: FormGroup;
   @Input() model: DynamicDsDatePickerModel;
-  // @Input()
-  // minDate;
-  // @Input()
-  // maxDate;
 
   @Output() selected = new EventEmitter<number>();
   @Output() remove = new EventEmitter<number>();
@@ -65,7 +61,7 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
     this.initialMonth = now.getMonth() + 1;
     this.initialDay = now.getDate();
 
-    if (this.model.value && this.model.value !== null) {
+    if (this.model && this.model.value !== null) {
       const values = this.model.value.toString().split(DS_DATE_PICKER_SEPARATOR);
       if (values.length > 0) {
         this.initialYear = parseInt(values[0], 10);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
index 995fcbf3503..7f7c3e68d5c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -17,6 +17,7 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
   valueUpdates: Subject<any>;
   malformedDate: boolean;
   hasLanguages = false;
+  repeatable = false;
 
   constructor(config: DynamicDateControlModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
index 8e0c6fc20ec..3aaff1339f6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -15,7 +15,7 @@ describe('DsDynamicDisabledComponent', () => {
   let model;
 
   function init() {
-    model = new DynamicDisabledModel({ value: 'test', repeatable: false, metadataFields: [], submissionId: '1234', id: '1' });
+    model = new DynamicDisabledModel({ value: 'test', repeatable: false, metadataFields: [], submissionId: '1234', id: '1', hasSelectableMetadata: false });
   }
 
   beforeEach(async(() => {
@@ -52,7 +52,6 @@ describe('DsDynamicDisabledComponent', () => {
 
   it('should have a disabled input', () => {
     const input = de.query(By.css('input'));
-    console.log(input.nativeElement.getAttribute('disabled'));
     expect(input.nativeElement.getAttribute('disabled')).toEqual('');
   });
 });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
index 0fa2b3e5ed2..5eb9aa8dd20 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
@@ -5,6 +5,7 @@ export const DYNAMIC_FORM_CONTROL_TYPE_DISABLED = 'EMPTY';
 
 export interface DsDynamicDisabledModelConfig extends DsDynamicInputModelConfig {
   value?: any;
+  hasSelectableMetadata: boolean;
 }
 
 /**
@@ -14,11 +15,14 @@ export class DynamicDisabledModel extends DsDynamicInputModel {
 
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_DISABLED;
   @serializable() value: any;
+  @serializable() hasSelectableMetadata: boolean;
 
   constructor(config: DsDynamicDisabledModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
     this.readOnly = true;
     this.disabled = true;
+    this.hasSelectableMetadata = config.hasSelectableMetadata;
+
     this.valueUpdates.next(config.value);
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
index af05d5bf35c..7d4b58c95d2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
@@ -2,10 +2,11 @@ import { DynamicFormControlLayout, DynamicFormGroupModel, DynamicFormGroupModelC
 
 import { Subject } from 'rxjs';
 
-import { isNotEmpty } from '../../../../empty.util';
+import { hasNoValue, isNotEmpty } from '../../../../empty.util';
 import { DsDynamicInputModel } from './ds-dynamic-input.model';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
 
 export const CONCAT_GROUP_SUFFIX = '_CONCAT_GROUP';
 export const CONCAT_FIRST_INPUT_SUFFIX = '_CONCAT_FIRST_INPUT';
@@ -14,11 +15,14 @@ export const CONCAT_SECOND_INPUT_SUFFIX = '_CONCAT_SECOND_INPUT';
 export interface DynamicConcatModelConfig extends DynamicFormGroupModelConfig {
   separator: string;
   value?: any;
+  hint?: string;
   relationship?: RelationshipOptions;
   repeatable: boolean;
   required: boolean;
   metadataFields: string[];
   submissionId: string;
+  hasSelectableMetadata: boolean;
+  metadataValue?: MetadataValue;
 }
 
 export class DynamicConcatModel extends DynamicFormGroupModel {
@@ -28,8 +32,11 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
   @serializable() relationship?: RelationshipOptions;
   @serializable() repeatable?: boolean;
   @serializable() required?: boolean;
+  @serializable() hint?: string;
   @serializable() metadataFields: string[];
   @serializable() submissionId: string;
+  @serializable() hasSelectableMetadata: boolean;
+  @serializable() metadataValue: MetadataValue;
 
   isCustomGroup = true;
   valueUpdates: Subject<string>;
@@ -37,26 +44,30 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
   constructor(config: DynamicConcatModelConfig, layout?: DynamicFormControlLayout) {
 
     super(config, layout);
-
     this.separator = config.separator + ' ';
     this.relationship = config.relationship;
     this.repeatable = config.repeatable;
     this.required = config.required;
+    this.hint = config.hint;
     this.metadataFields = config.metadataFields;
     this.submissionId = config.submissionId;
-
+    this.hasSelectableMetadata = config.hasSelectableMetadata;
+    this.metadataValue = config.metadataValue;
     this.valueUpdates = new Subject<string>();
     this.valueUpdates.subscribe((value: string) => this.value = value);
   }
 
   get value() {
-    const firstValue = (this.get(0) as DsDynamicInputModel).value;
-    const secondValue = (this.get(1) as DsDynamicInputModel).value;
-
-    if (isNotEmpty(firstValue) && isNotEmpty(secondValue)) {
-      return new FormFieldMetadataValueObject(firstValue + this.separator + secondValue);
-    } else if (isNotEmpty(firstValue)) {
-      return new FormFieldMetadataValueObject(firstValue);
+    const [firstValue, secondValue] = this.group.map((inputModel: DsDynamicInputModel) =>
+      (typeof inputModel.value === 'string') ?
+        Object.assign(new FormFieldMetadataValueObject(), { value: inputModel.value, display: inputModel.value }) :
+        (inputModel.value as any));
+    if (isNotEmpty(firstValue) && isNotEmpty(firstValue.value) && isNotEmpty(secondValue) && isNotEmpty(secondValue.value)) {
+      return Object.assign(new FormFieldMetadataValueObject(), firstValue, { value: firstValue.value + this.separator + secondValue.value });
+    } else if (isNotEmpty(firstValue) && isNotEmpty(firstValue.value)) {
+      return Object.assign(new FormFieldMetadataValueObject(), firstValue);
+    } else if (isNotEmpty(secondValue) && isNotEmpty(secondValue.value)) {
+      return Object.assign(new FormFieldMetadataValueObject(), secondValue);
     } else {
       return null;
     }
@@ -71,18 +82,21 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
     } else {
       tempValue = value.value;
     }
-
-    if (tempValue.includes(this.separator)) {
-      values = tempValue.split(this.separator);
-    } else {
-      values = [tempValue, null];
+    if (hasNoValue(tempValue)) {
+      tempValue = '';
     }
+    values = [...tempValue.split(this.separator), null].map((v) =>
+      Object.assign(new FormFieldMetadataValueObject(), value, { display: v, value: v }));
 
-    if (values[0]) {
+    if (values[0].value) {
       (this.get(0) as DsDynamicInputModel).valueUpdates.next(values[0]);
+    } else {
+      (this.get(0) as DsDynamicInputModel).valueUpdates.next(undefined);
     }
-    if (values[1]) {
+    if (values[1].value) {
       (this.get(1) as DsDynamicInputModel).valueUpdates.next(values[1]);
+    } else {
+      (this.get(1) as DsDynamicInputModel).valueUpdates.next(undefined);
     }
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
index 3827df7be66..290e29dc658 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
@@ -1,26 +1,35 @@
-import { DynamicFormControlLayout, DynamicInputModel, DynamicInputModelConfig, serializable } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlLayout,
+  DynamicInputModel,
+  DynamicInputModelConfig,
+  serializable
+} from '@ng-dynamic-forms/core';
 import { Subject } from 'rxjs';
 
 import { LanguageCode } from '../../models/form-field-language-value.model';
-import { AuthorityOptions } from '../../../../../core/integration/models/authority-options.model';
+import { VocabularyOptions } from '../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { hasValue } from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 
 export interface DsDynamicInputModelConfig extends DynamicInputModelConfig {
-  authorityOptions?: AuthorityOptions;
+  vocabularyOptions?: VocabularyOptions;
   languageCodes?: LanguageCode[];
   language?: string;
+  place?: number;
   value?: any;
   relationship?: RelationshipOptions;
   repeatable: boolean;
   metadataFields: string[];
   submissionId: string;
+  hasSelectableMetadata: boolean;
+  metadataValue?: FormFieldMetadataValueObject;
+
 }
 
 export class DsDynamicInputModel extends DynamicInputModel {
 
-  @serializable() authorityOptions: AuthorityOptions;
+  @serializable() vocabularyOptions: VocabularyOptions;
   @serializable() private _languageCodes: LanguageCode[];
   @serializable() private _language: string;
   @serializable() languageUpdates: Subject<string>;
@@ -28,6 +37,8 @@ export class DsDynamicInputModel extends DynamicInputModel {
   @serializable() repeatable?: boolean;
   @serializable() metadataFields: string[];
   @serializable() submissionId: string;
+  @serializable() hasSelectableMetadata: boolean;
+  @serializable() metadataValue: FormFieldMetadataValueObject;
 
   constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
@@ -38,10 +49,12 @@ export class DsDynamicInputModel extends DynamicInputModel {
     this.value = config.value;
     this.relationship = config.relationship;
     this.submissionId = config.submissionId;
+    this.hasSelectableMetadata = config.hasSelectableMetadata;
+    this.metadataValue = config.metadataValue;
 
     this.language = config.language;
     if (!this.language) {
-      // TypeAhead
+      // Onebox
       if (config.value instanceof FormFieldMetadataValueObject) {
         this.language = config.value.language;
       } else if (Array.isArray(config.value)) {
@@ -58,11 +71,11 @@ export class DsDynamicInputModel extends DynamicInputModel {
       this.language = lang;
     });
 
-    this.authorityOptions = config.authorityOptions;
+    this.vocabularyOptions = config.vocabularyOptions;
   }
 
   get hasAuthority(): boolean {
-    return this.authorityOptions && hasValue(this.authorityOptions.name);
+    return this.vocabularyOptions && hasValue(this.vocabularyOptions.name);
   }
 
   get hasLanguages(): boolean {
@@ -83,7 +96,7 @@ export class DsDynamicInputModel extends DynamicInputModel {
 
   set languageCodes(languageCodes: LanguageCode[]) {
     this._languageCodes = languageCodes;
-    if (!this.language || this.language === null || this.language === '') {
+    if (!this.language || this.language === '') {
       this.language = this.languageCodes ? this.languageCodes[0].code : null;
     }
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
index 7de319bf560..8925d8fd87a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
@@ -1,18 +1,34 @@
 import { DynamicFormArrayModel, DynamicFormArrayModelConfig, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
+import { RelationshipOptions } from '../../models/relationship-options.model';
 
 export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig {
   notRepeatable: boolean;
   required: boolean;
+  submissionId: string;
+  relationshipConfig: RelationshipOptions;
+  metadataKey: string;
+  metadataFields: string[];
+  hasSelectableMetadata: boolean;
 }
 
 export class DynamicRowArrayModel extends DynamicFormArrayModel {
   @serializable() notRepeatable = false;
   @serializable() required = false;
+  @serializable() submissionId: string;
+  @serializable() relationshipConfig: RelationshipOptions;
+  @serializable() metadataKey: string;
+  @serializable() metadataFields: string[];
+  @serializable() hasSelectableMetadata: boolean;
   isRowArray = true;
 
   constructor(config: DynamicRowArrayModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
     this.notRepeatable = config.notRepeatable;
     this.required = config.required;
+    this.submissionId = config.submissionId;
+    this.relationshipConfig = config.relationshipConfig;
+    this.metadataKey = config.metadataKey;
+    this.metadataFields = config.metadataFields;
+    this.hasSelectableMetadata = config.hasSelectableMetadata;
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
new file mode 100644
index 00000000000..83bacf6ea86
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
@@ -0,0 +1,134 @@
+import { EventEmitter, Input, Output } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+
+import {
+  DynamicFormControlComponent,
+  DynamicFormLayoutService,
+  DynamicFormValidationService
+} from '@ng-dynamic-forms/core';
+import { map } from 'rxjs/operators';
+import { Observable, of as observableOf } from 'rxjs';
+
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
+import { isNotEmpty } from '../../../../empty.util';
+import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
+import { VocabularyEntry } from '../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { DsDynamicInputModel } from './ds-dynamic-input.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+
+/**
+ * An abstract class to be extended by form components that handle vocabulary
+ */
+export abstract class DsDynamicVocabularyComponent extends DynamicFormControlComponent {
+
+  @Input() abstract bindId = true;
+  @Input() abstract group: FormGroup;
+  @Input() abstract model: DsDynamicInputModel;
+
+  @Output() abstract blur: EventEmitter<any> = new EventEmitter<any>();
+  @Output() abstract change: EventEmitter<any> = new EventEmitter<any>();
+  @Output() abstract focus: EventEmitter<any> = new EventEmitter<any>();
+
+  public abstract pageInfo: PageInfo;
+
+  protected constructor(protected vocabularyService: VocabularyService,
+                        protected layoutService: DynamicFormLayoutService,
+                        protected validationService: DynamicFormValidationService
+  ) {
+    super(layoutService, validationService);
+  }
+
+  /**
+   * Sets the current value with the given value.
+   * @param value The value to set.
+   * @param init Representing if is init value or not.
+   */
+  public abstract setCurrentValue(value: any, init?: boolean);
+
+  /**
+   * Retrieves the init form value from model
+   */
+  getInitValueFromModel(): Observable<FormFieldMetadataValueObject> {
+    let initValue$: Observable<FormFieldMetadataValueObject>;
+    if (isNotEmpty(this.model.value) && (this.model.value instanceof FormFieldMetadataValueObject)) {
+      let initEntry$: Observable<VocabularyEntry>;
+      if (this.model.value.hasAuthority()) {
+        initEntry$ = this.vocabularyService.getVocabularyEntryByID(this.model.value.authority, this.model.vocabularyOptions)
+      } else {
+        initEntry$ = this.vocabularyService.getVocabularyEntryByValue(this.model.value.value, this.model.vocabularyOptions)
+      }
+      initValue$ = initEntry$.pipe(map((initEntry: VocabularyEntry) => {
+        if (isNotEmpty(initEntry)) {
+          // Integrate FormFieldMetadataValueObject with retrieved information
+          return new FormFieldMetadataValueObject(
+            initEntry.value,
+            null,
+            initEntry.authority,
+            initEntry.display,
+            (this.model.value as any).place,
+            null,
+            initEntry.otherInformation || null
+          );
+        } else {
+          return this.model.value as any;
+        }
+      }));
+    } else if (isNotEmpty(this.model.value) && (this.model.value instanceof VocabularyEntry)) {
+      initValue$ = observableOf(
+        new FormFieldMetadataValueObject(
+          this.model.value.value,
+          null,
+          this.model.value.authority,
+          this.model.value.display,
+          0,
+          null,
+          this.model.value.otherInformation || null
+        )
+      );
+    } else {
+      initValue$ = observableOf(new FormFieldMetadataValueObject(this.model.value));
+    }
+    return initValue$;
+  }
+
+  /**
+   * Emits a blur event containing a given value.
+   * @param event The value to emit.
+   */
+  onBlur(event: Event) {
+    this.blur.emit(event);
+  }
+
+  /**
+   * Emits a focus event containing a given value.
+   * @param event The value to emit.
+   */
+  onFocus(event) {
+    this.focus.emit(event);
+  }
+
+  /**
+   * Emits a change event and updates model value.
+   * @param updateValue
+   */
+  dispatchUpdate(updateValue: any) {
+    this.model.valueUpdates.next(updateValue);
+    this.change.emit(updateValue);
+  }
+
+  /**
+   * Update the page info object
+   * @param elementsPerPage
+   * @param currentPage
+   * @param totalElements
+   * @param totalPages
+   */
+  protected updatePageInfo(elementsPerPage: number, currentPage: number, totalElements?: number, totalPages?: number) {
+    this.pageInfo = Object.assign(new PageInfo(), {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      totalElements: totalElements,
+      totalPages: totalPages
+    });
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
index 897ea4c5e3b..c80b0d4e087 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
@@ -6,7 +6,6 @@
        [ngClass]="getClass('element','control')">
 
     <ds-dynamic-form-control-container *ngFor="let _model of model.group"
-                                       [asBootstrapFormGroup]="true"
                                        [group]="control"
                                        [hasErrorMessaging]="model.hasErrorMessages"
                                        [hidden]="_model.hidden"
@@ -19,5 +18,4 @@
                                        (dfFocus)="onFocus($event)"
                                        (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
   </div>
-
 </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
index f6b58c1504c..1bc427f9a67 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
@@ -1,16 +1,17 @@
 import { Subject } from 'rxjs';
-
 import {
-  DynamicCheckboxGroupModel, DynamicFormControlLayout,
+  DynamicCheckboxGroupModel,
+  DynamicFormControlLayout,
   DynamicFormGroupModelConfig,
   serializable
 } from '@ng-dynamic-forms/core';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
+
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { hasValue } from '../../../../../empty.util';
 
 export interface DynamicListCheckboxGroupModelConfig extends DynamicFormGroupModelConfig {
-  authorityOptions: AuthorityOptions;
+  vocabularyOptions: VocabularyOptions;
   groupLength?: number;
   repeatable: boolean;
   value?: any;
@@ -18,41 +19,41 @@ export interface DynamicListCheckboxGroupModelConfig extends DynamicFormGroupMod
 
 export class DynamicListCheckboxGroupModel extends DynamicCheckboxGroupModel {
 
-  @serializable() authorityOptions: AuthorityOptions;
+  @serializable() vocabularyOptions: VocabularyOptions;
   @serializable() repeatable: boolean;
   @serializable() groupLength: number;
-  @serializable() _value: AuthorityValue[];
+  @serializable() _value: VocabularyEntry[];
   isListGroup = true;
   valueUpdates: Subject<any>;
 
   constructor(config: DynamicListCheckboxGroupModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
 
-    this.authorityOptions = config.authorityOptions;
+    this.vocabularyOptions = config.vocabularyOptions;
     this.groupLength = config.groupLength || 5;
     this._value = [];
     this.repeatable = config.repeatable;
 
     this.valueUpdates = new Subject<any>();
-    this.valueUpdates.subscribe((value: AuthorityValue | AuthorityValue[]) => this.value = value);
+    this.valueUpdates.subscribe((value: VocabularyEntry | VocabularyEntry[]) => this.value = value);
     this.valueUpdates.next(config.value);
   }
 
   get hasAuthority(): boolean {
-    return this.authorityOptions && hasValue(this.authorityOptions.name);
+    return this.vocabularyOptions && hasValue(this.vocabularyOptions.name);
   }
 
   get value() {
     return this._value;
   }
 
-  set value(value: AuthorityValue | AuthorityValue[]) {
+  set value(value: VocabularyEntry | VocabularyEntry[]) {
     if (value) {
       if (Array.isArray(value)) {
         this._value = value;
       } else {
         // _value is non extendible so assign it a new array
-        const newValue = (this.value as AuthorityValue[]).concat([value]);
+        const newValue = (this.value as VocabularyEntry[]).concat([value]);
         this._value = newValue
       }
     }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
index 287c10f3fed..a4a0fb77499 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
@@ -4,11 +4,11 @@ import {
   DynamicRadioGroupModelConfig,
   serializable
 } from '@ng-dynamic-forms/core';
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { hasValue } from '../../../../../empty.util';
 
 export interface DynamicListModelConfig extends DynamicRadioGroupModelConfig<any> {
-  authorityOptions: AuthorityOptions;
+  vocabularyOptions: VocabularyOptions;
   groupLength?: number;
   repeatable: boolean;
   value?: any;
@@ -16,7 +16,7 @@ export interface DynamicListModelConfig extends DynamicRadioGroupModelConfig<any
 
 export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
 
-  @serializable() authorityOptions: AuthorityOptions;
+  @serializable() vocabularyOptions: VocabularyOptions;
   @serializable() repeatable: boolean;
   @serializable() groupLength: number;
   isListGroup = true;
@@ -24,13 +24,13 @@ export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
   constructor(config: DynamicListModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
 
-    this.authorityOptions = config.authorityOptions;
+    this.vocabularyOptions = config.vocabularyOptions;
     this.groupLength = config.groupLength || 5;
     this.repeatable = config.repeatable;
     this.valueUpdates.next(config.value);
   }
 
   get hasAuthority(): boolean {
-    return this.authorityOptions && hasValue(this.authorityOptions.name);
+    return this.vocabularyOptions && hasValue(this.vocabularyOptions.name);
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
index 63ae56e59ad..b041736e343 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
@@ -2,25 +2,25 @@
 import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { async, ComponentFixture, inject, TestBed, } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { DsDynamicListComponent } from './dynamic-list.component';
-import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
-import { FormBuilderService } from '../../../form-builder.service';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import {
   DynamicFormControlLayout,
   DynamicFormLayoutService,
   DynamicFormsCoreModule,
   DynamicFormValidationService
 } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { AuthorityServiceStub } from '../../../../../testing/authority-service.stub';
+
+import { DsDynamicListComponent } from './dynamic-list.component';
+import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { FormBuilderService } from '../../../form-builder.service';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
-import { By } from '@angular/platform-browser';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { createTestComponent } from '../../../../../testing/utils.test';
 
 export const LAYOUT_TEST = {
@@ -35,12 +35,10 @@ export const LIST_TEST_GROUP = new FormGroup({
 });
 
 export const LIST_CHECKBOX_TEST_MODEL_CONFIG = {
-  authorityOptions: {
-    closed: false,
-    metadata: 'listCheckbox',
+  vocabularyOptions: {
     name: 'type_programme',
-    scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-  } as AuthorityOptions,
+    closed: false
+  } as VocabularyOptions,
   disabled: false,
   id: 'listCheckbox',
   label: 'Programme',
@@ -52,12 +50,10 @@ export const LIST_CHECKBOX_TEST_MODEL_CONFIG = {
 };
 
 export const LIST_RADIO_TEST_MODEL_CONFIG = {
-  authorityOptions: {
-    closed: false,
-    metadata: 'listRadio',
+  vocabularyOptions: {
     name: 'type_programme',
-    scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-  } as AuthorityOptions,
+    closed: false
+  } as VocabularyOptions,
   disabled: false,
   id: 'listRadio',
   label: 'Programme',
@@ -77,7 +73,7 @@ describe('DsDynamicListComponent test suite', () => {
   let html;
   let modelValue;
 
-  const authorityServiceStub = new AuthorityServiceStub();
+  const vocabularyServiceStub = new VocabularyServiceStub();
 
   // async beforeEach
   beforeEach(async(() => {
@@ -99,9 +95,9 @@ describe('DsDynamicListComponent test suite', () => {
         DsDynamicListComponent,
         DynamicFormValidationService,
         FormBuilderService,
-        {provide: AuthorityService, useValue: authorityServiceStub},
-        {provide: DynamicFormLayoutService, useValue: {}},
-        {provide: DynamicFormValidationService, useValue: {}}
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
+        { provide: DynamicFormLayoutService, useValue: {} },
+        { provide: DynamicFormValidationService, useValue: {} }
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
@@ -147,20 +143,16 @@ describe('DsDynamicListComponent test suite', () => {
       });
 
       it('should init component properly', () => {
-        const results$ = authorityServiceStub.getEntriesByName({} as  any);
-
-        results$.subscribe((results) => {
-          expect((listComp as any).optionsList).toEqual(results.payload);
-          expect(listComp.items.length).toBe(1);
-          expect(listComp.items[0].length).toBe(2);
-        })
+        expect((listComp as any).optionsList).toEqual(vocabularyServiceStub.getList());
+        expect(listComp.items.length).toBe(1);
+        expect(listComp.items[0].length).toBe(2);
       });
 
       it('should set model value properly when a checkbox option is selected', () => {
         const de = listFixture.debugElement.queryAll(By.css('div.custom-checkbox'));
         const items = de[0].queryAll(By.css('input.custom-control-input'));
         const item = items[0];
-        modelValue = [Object.assign(new AuthorityValue(), {id: 1, display: 'one', value: 1})];
+        modelValue = [Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 })];
 
         item.nativeElement.click();
 
@@ -187,7 +179,7 @@ describe('DsDynamicListComponent test suite', () => {
         listComp = listFixture.componentInstance; // FormComponent test instance
         listComp.group = LIST_TEST_GROUP;
         listComp.model = new DynamicListCheckboxGroupModel(LIST_CHECKBOX_TEST_MODEL_CONFIG, LAYOUT_TEST);
-        modelValue = [Object.assign(new AuthorityValue(), {id: 1, display: 'one', value: 1})];
+        modelValue = [Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 })];
         listComp.model.value = modelValue;
         listFixture.detectChanges();
       });
@@ -198,13 +190,9 @@ describe('DsDynamicListComponent test suite', () => {
       });
 
       it('should init component properly', () => {
-        const results$ = authorityServiceStub.getEntriesByName({} as  any);
-
-        results$.subscribe((results) => {
-          expect((listComp as any).optionsList).toEqual(results.payload);
-          expect(listComp.model.value).toEqual(modelValue);
-          expect((listComp.model as DynamicListCheckboxGroupModel).group[0].value).toBeTruthy();
-        })
+        expect((listComp as any).optionsList).toEqual(vocabularyServiceStub.getList());
+        expect(listComp.model.value).toEqual(modelValue);
+        expect((listComp.model as DynamicListCheckboxGroupModel).group[0].value).toBeTruthy();
       });
 
       it('should set model value properly when a checkbox option is deselected', () => {
@@ -237,20 +225,16 @@ describe('DsDynamicListComponent test suite', () => {
       });
 
       it('should init component properly', () => {
-        const results$ = authorityServiceStub.getEntriesByName({} as  any);
-
-        results$.subscribe((results) => {
-          expect((listComp as any).optionsList).toEqual(results.payload);
-          expect(listComp.items.length).toBe(1);
-          expect(listComp.items[0].length).toBe(2);
-        })
+        expect((listComp as any).optionsList).toEqual(vocabularyServiceStub.getList());
+        expect(listComp.items.length).toBe(1);
+        expect(listComp.items[0].length).toBe(2);
       });
 
       it('should set model value when a radio option is selected', () => {
         const de = listFixture.debugElement.queryAll(By.css('div.custom-radio'));
         const items = de[0].queryAll(By.css('input.custom-control-input'));
         const item = items[0];
-        modelValue = Object.assign(new AuthorityValue(), {id: 1, display: 'one', value: 1});
+        modelValue = Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 });
 
         item.nativeElement.click();
 
@@ -265,7 +249,7 @@ describe('DsDynamicListComponent test suite', () => {
         listComp = listFixture.componentInstance; // FormComponent test instance
         listComp.group = LIST_TEST_GROUP;
         listComp.model = new DynamicListRadioGroupModel(LIST_RADIO_TEST_MODEL_CONFIG, LAYOUT_TEST);
-        modelValue = Object.assign(new AuthorityValue(), {id: 1, display: 'one', value: 1});
+        modelValue = Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 });
         listComp.model.value = modelValue;
         listFixture.detectChanges();
       });
@@ -276,13 +260,9 @@ describe('DsDynamicListComponent test suite', () => {
       });
 
       it('should init component properly', () => {
-        const results$ = authorityServiceStub.getEntriesByName({} as  any);
-
-        results$.subscribe((results) => {
-          expect((listComp as any).optionsList).toEqual(results.payload);
-          expect(listComp.model.value).toEqual(modelValue);
-          expect((listComp.model as DynamicListRadioGroupModel).options[0].value).toBeTruthy();
-        })
+        expect((listComp as any).optionsList).toEqual(vocabularyServiceStub.getList());
+        expect(listComp.model.value).toEqual(modelValue);
+        expect((listComp.model as DynamicListRadioGroupModel).options[0].value).toBeTruthy();
       });
     });
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index d023f1c583c..99c46dc844d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,20 +1,23 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { findKey } from 'lodash';
 
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { IntegrationSearchOptions } from '../../../../../../core/integration/models/integration-options.model';
-import { hasValue, isNotEmpty } from '../../../../../empty.util';
-import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
-import { FormBuilderService } from '../../../form-builder.service';
 import {
   DynamicCheckboxModel,
-  DynamicFormControlComponent, DynamicFormLayoutService,
+  DynamicFormControlComponent,
+  DynamicFormLayoutService,
   DynamicFormValidationService
 } from '@ng-dynamic-forms/core';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
+import { findKey } from 'lodash';
+
+import { hasValue, isNotEmpty } from '../../../../../empty.util';
+import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
+import { FormBuilderService } from '../../../form-builder.service';
 import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
-import { IntegrationData } from '../../../../../../core/integration/integration-data';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
 
 export interface ListItem {
   id: string,
@@ -23,12 +26,14 @@ export interface ListItem {
   index: number
 }
 
+/**
+ * Component representing a list input field
+ */
 @Component({
   selector: 'ds-dynamic-list',
   styleUrls: ['./dynamic-list.component.scss'],
   templateUrl: './dynamic-list.component.html'
 })
-
 export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
   @Input() bindId = true;
   @Input() group: FormGroup;
@@ -39,10 +44,9 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   public items: ListItem[][] = [];
-  protected optionsList: AuthorityValue[];
-  protected searchOptions: IntegrationSearchOptions;
+  protected optionsList: VocabularyEntry[];
 
-  constructor(private authorityService: AuthorityService,
+  constructor(private vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
               private formBuilderService: FormBuilderService,
               protected layoutService: DynamicFormLayoutService,
@@ -51,39 +55,46 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
     super(layoutService, validationService);
   }
 
+  /**
+   * Initialize the component, setting up the field options
+   */
   ngOnInit() {
-    if (this.hasAuthorityOptions()) {
-      // TODO Replace max elements 1000 with a paginated request when pagination bug is resolved
-      this.searchOptions = new IntegrationSearchOptions(
-        this.model.authorityOptions.scope,
-        this.model.authorityOptions.name,
-        this.model.authorityOptions.metadata,
-        '',
-        1000, // Max elements
-        1);// Current Page
-      this.setOptionsFromAuthority();
+    if (this.model.vocabularyOptions && hasValue(this.model.vocabularyOptions.name)) {
+      this.setOptionsFromVocabulary();
     }
   }
 
+  /**
+   * Emits a blur event containing a given value.
+   * @param event The value to emit.
+   */
   onBlur(event: Event) {
     this.blur.emit(event);
   }
 
+  /**
+   * Emits a focus event containing a given value.
+   * @param event The value to emit.
+   */
   onFocus(event: Event) {
     this.focus.emit(event);
   }
 
+  /**
+   * Updates model value with the current value
+   * @param event The change event.
+   */
   onChange(event: Event) {
     const target = event.target as any;
     if (this.model.repeatable) {
       // Target tabindex coincide with the array index of the value into the authority list
-      const authorityValue: AuthorityValue = this.optionsList[target.tabIndex];
+      const entry: VocabularyEntry = this.optionsList[target.tabIndex];
       if (target.checked) {
-        this.model.valueUpdates.next(authorityValue);
+        this.model.valueUpdates.next(entry);
       } else {
         const newValue = [];
         this.model.value
-          .filter((item) => item.value !== authorityValue.value)
+          .filter((item) => item.value !== entry.value)
           .forEach((item) => newValue.push(item));
         this.model.valueUpdates.next(newValue);
       }
@@ -93,17 +104,25 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
     this.change.emit(event);
   }
 
-  protected setOptionsFromAuthority() {
-    if (this.model.authorityOptions.name && this.model.authorityOptions.name.length > 0) {
+  /**
+   * Setting up the field options from vocabulary
+   */
+  protected setOptionsFromVocabulary() {
+    if (this.model.vocabularyOptions.name && this.model.vocabularyOptions.name.length > 0) {
       const listGroup = this.group.controls[this.model.id] as FormGroup;
-      this.authorityService.getEntriesByName(this.searchOptions).subscribe((authorities: IntegrationData) => {
+      const pageInfo: PageInfo = new PageInfo({
+        elementsPerPage: Number.MAX_VALUE, currentPage: 1
+      } as PageInfo);
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
+        getFirstSucceededRemoteDataPayload()
+      ).subscribe((entries: PaginatedList<VocabularyEntry>) => {
         let groupCounter = 0;
         let itemsPerGroup = 0;
         let tempList: ListItem[] = [];
-        this.optionsList = authorities.payload as AuthorityValue[];
+        this.optionsList = entries.page;
         // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-        (authorities.payload as AuthorityValue[]).forEach((option, key) => {
-          const value = option.id || option.value;
+        entries.page.forEach((option, key) => {
+          const value = option.authority || option.value;
           const checked: boolean = isNotEmpty(findKey(
             this.model.value,
             (v) => v.value === option.value));
@@ -137,9 +156,4 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
     }
   }
 
-  protected hasAuthorityOptions() {
-    return (hasValue(this.model.authorityOptions.scope)
-      && hasValue(this.model.authorityOptions.name)
-      && hasValue(this.model.authorityOptions.metadata));
-  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 254b15411d4..b274197f137 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -21,8 +21,8 @@
              [placeholder]="model.placeholder | translate"
              [readonly]="model.readOnly"
              (change)="onChange($event)"
-             (blur)="onBlurEvent($event); $event.stopPropagation(); sdRef.close();"
-             (focus)="onFocusEvent($event); $event.stopPropagation(); sdRef.close();"
+             (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
+             (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
              (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();">
     </div>
 
@@ -40,8 +40,8 @@
               [placeholder]="model.secondPlaceholder | translate"
               [readonly]="model.readOnly"
               (change)="onChange($event)"
-              (blur)="onBlurEvent($event); $event.stopPropagation(); sdRef.close();"
-              (focus)="onFocusEvent($event); $event.stopPropagation(); sdRef.close();"
+              (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
+              (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
               (click)="$event.stopPropagation(); sdRef.close();">
     </div>
     <div class="col-auto text-center">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index c77aabfeeda..f577e643cda 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -2,33 +2,32 @@
 import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { async, ComponentFixture, fakeAsync, inject, TestBed, tick, } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 
+import { of as observableOf } from 'rxjs';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { AuthorityServiceStub } from '../../../../../testing/authority-service.stub';
+import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { DsDynamicLookupComponent } from './dynamic-lookup.component';
-import { DynamicLookupModel } from './dynamic-lookup.model';
-import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { TranslateModule } from '@ngx-translate/core';
+import { DynamicLookupModel, DynamicLookupModelConfig } from './dynamic-lookup.model';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { By } from '@angular/platform-browser';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { createTestComponent } from '../../../../../testing/utils.test';
 import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
 import { AuthorityConfidenceStateDirective } from '../../../../../authority-confidence/authority-confidence-state.directive';
 import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
 
-let LOOKUP_TEST_MODEL_CONFIG = {
-  authorityOptions: {
-    closed: false,
-    metadata: 'lookup',
+let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
+  vocabularyOptions: {
     name: 'RPAuthority',
-    scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-  } as AuthorityOptions,
+    closed: false
+  } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
   id: 'lookup',
@@ -39,20 +38,18 @@ let LOOKUP_TEST_MODEL_CONFIG = {
   readOnly: false,
   required: true,
   repeatable: true,
-  separator: ',',
   validators: { required: null },
   value: undefined,
   metadataFields: [],
-  submissionId: '1234'
+  submissionId: '1234',
+  hasSelectableMetadata: false
 };
 
 let LOOKUP_NAME_TEST_MODEL_CONFIG = {
-  authorityOptions: {
-    closed: false,
-    metadata: 'lookup-name',
+  vocabularyOptions: {
     name: 'RPAuthority',
-    scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-  } as AuthorityOptions,
+    closed: false
+  } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
   id: 'lookupName',
@@ -63,11 +60,11 @@ let LOOKUP_NAME_TEST_MODEL_CONFIG = {
   readOnly: false,
   required: true,
   repeatable: true,
-  separator: ',',
   validators: { required: null },
   value: undefined,
   metadataFields: [],
-  submissionId: '1234'
+  submissionId: '1234',
+  hasSelectableMetadata: false
 };
 
 let LOOKUP_TEST_GROUP = new FormGroup({
@@ -78,12 +75,10 @@ let LOOKUP_TEST_GROUP = new FormGroup({
 describe('Dynamic Lookup component', () => {
   function init() {
     LOOKUP_TEST_MODEL_CONFIG = {
-      authorityOptions: {
-        closed: false,
-        metadata: 'lookup',
+      vocabularyOptions: {
         name: 'RPAuthority',
-        scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-      } as AuthorityOptions,
+        closed: false
+      } as VocabularyOptions,
       disabled: false,
       errorMessages: { required: 'Required field.' },
       id: 'lookup',
@@ -94,20 +89,18 @@ describe('Dynamic Lookup component', () => {
       readOnly: false,
       required: true,
       repeatable: true,
-      separator: ',',
       validators: { required: null },
       value: undefined,
       metadataFields: [],
-      submissionId: '1234'
+      submissionId: '1234',
+      hasSelectableMetadata: false
     };
 
     LOOKUP_NAME_TEST_MODEL_CONFIG = {
-      authorityOptions: {
-        closed: false,
-        metadata: 'lookup-name',
+      vocabularyOptions: {
         name: 'RPAuthority',
-        scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-      } as AuthorityOptions,
+        closed: false
+      } as VocabularyOptions,
       disabled: false,
       errorMessages: { required: 'Required field.' },
       id: 'lookupName',
@@ -118,11 +111,11 @@ describe('Dynamic Lookup component', () => {
       readOnly: false,
       required: true,
       repeatable: true,
-      separator: ',',
       validators: { required: null },
       value: undefined,
       metadataFields: [],
-      submissionId: '1234'
+      submissionId: '1234',
+      hasSelectableMetadata: false
     };
 
     LOOKUP_TEST_GROUP = new FormGroup({
@@ -137,12 +130,11 @@ describe('Dynamic Lookup component', () => {
   let testFixture: ComponentFixture<TestComponent>;
   let lookupFixture: ComponentFixture<DsDynamicLookupComponent>;
   let html;
+  let vocabularyServiceStub: VocabularyServiceStub;
 
-  let authorityServiceStub;
   // async beforeEach
   beforeEach(async(() => {
-    const authorityService = new AuthorityServiceStub();
-    authorityServiceStub = authorityService;
+    vocabularyServiceStub = new VocabularyServiceStub();
     TestBed.configureTestingModule({
       imports: [
         DynamicFormsCoreModule,
@@ -162,7 +154,7 @@ describe('Dynamic Lookup component', () => {
       providers: [
         ChangeDetectorRef,
         DsDynamicLookupComponent,
-        { provide: AuthorityService, useValue: authorityService },
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: {} },
         { provide: DynamicFormValidationService, useValue: {} }
       ],
@@ -247,7 +239,7 @@ describe('Dynamic Lookup component', () => {
         it('should return search results', fakeAsync(() => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const btnEl = de[0].nativeElement;
-          const results$ = authorityServiceStub.getEntriesByName({} as  any);
+          const results = vocabularyServiceStub.getList();
 
           lookupComp.firstInputValue = 'test';
           lookupFixture.detectChanges();
@@ -255,17 +247,15 @@ describe('Dynamic Lookup component', () => {
           btnEl.click();
           tick();
           lookupFixture.detectChanges();
-          results$.subscribe((results) => {
-            expect(lookupComp.optionsList).toEqual(results.payload);
-          });
+          expect(lookupComp.optionsList).toEqual(results);
 
         }));
 
         it('should select a results entry properly', fakeAsync(() => {
           let de = lookupFixture.debugElement.queryAll(By.css('button'));
           const btnEl = de[0].nativeElement;
-          const selectedValue = Object.assign(new AuthorityValue(), {
-            id: 1,
+          const selectedValue = Object.assign(new VocabularyEntry(), {
+            authority: 1,
             display: 'one',
             value: 1
           });
@@ -284,7 +274,7 @@ describe('Dynamic Lookup component', () => {
           expect(lookupComp.change.emit).toHaveBeenCalled();
         }));
 
-        it('should set model.value on input type when AuthorityOptions.closed is false', fakeAsync(() => {
+        it('should set model.value on input type when VocabularyOptions.closed is false', fakeAsync(() => {
           lookupComp.firstInputValue = 'test';
           lookupFixture.detectChanges();
 
@@ -293,8 +283,8 @@ describe('Dynamic Lookup component', () => {
 
         }));
 
-        it('should not set model.value on input type when AuthorityOptions.closed is true', () => {
-          lookupComp.model.authorityOptions.closed = true;
+        it('should not set model.value on input type when VocabularyOptions.closed is true', () => {
+          lookupComp.model.vocabularyOptions.closed = true;
           lookupComp.firstInputValue = 'test';
           lookupFixture.detectChanges();
 
@@ -312,7 +302,13 @@ describe('Dynamic Lookup component', () => {
           lookupComp = lookupFixture.componentInstance; // FormComponent test instance
           lookupComp.group = LOOKUP_TEST_GROUP;
           lookupComp.model = new DynamicLookupModel(LOOKUP_TEST_MODEL_CONFIG);
-          lookupComp.model.value = new FormFieldMetadataValueObject('test', null, 'test001');
+          const entry = observableOf(Object.assign(new VocabularyEntry(), {
+            authority: null,
+            value: 'test',
+            display: 'testDisplay'
+          }));
+          spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
+          (lookupComp.model as any).value = new FormFieldMetadataValueObject('test', null, null, 'testDisplay');
           lookupFixture.detectChanges();
 
           // spyOn(store, 'dispatch');
@@ -321,9 +317,52 @@ describe('Dynamic Lookup component', () => {
           lookupFixture.destroy();
           lookupComp = null;
         });
-        it('should init component properly', () => {
-          expect(lookupComp.firstInputValue).toBe('test');
+        it('should init component properly', fakeAsync(() => {
+          tick();
+          expect(lookupComp.firstInputValue).toBe('testDisplay');
+          expect((lookupComp as any).vocabularyService.getVocabularyEntryByValue).toHaveBeenCalled();
+        }));
+
+        it('should have search button disabled on edit mode', () => {
+          lookupComp.editMode = true;
+          lookupFixture.detectChanges();
+
+          const de = lookupFixture.debugElement.queryAll(By.css('button'));
+          const searchBtnEl = de[0].nativeElement;
+          const saveBtnEl = de[1].nativeElement;
+          expect(searchBtnEl.disabled).toBe(true);
+          expect(saveBtnEl.disabled).toBe(false);
+          expect(saveBtnEl.textContent.trim()).toBe('form.save');
+
+        });
+      });
+      describe('and init model value is not empty with authority', () => {
+        beforeEach(() => {
+
+          lookupFixture = TestBed.createComponent(DsDynamicLookupComponent);
+          lookupComp = lookupFixture.componentInstance; // FormComponent test instance
+          lookupComp.group = LOOKUP_TEST_GROUP;
+          lookupComp.model = new DynamicLookupModel(LOOKUP_TEST_MODEL_CONFIG);
+          const entry = observableOf(Object.assign(new VocabularyEntry(), {
+            authority: 'test001',
+            value: 'test',
+            display: 'testDisplay'
+          }));
+          spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
+          lookupComp.model.value = new FormFieldMetadataValueObject('test', null, 'test001', 'testDisplay');
+          lookupFixture.detectChanges();
+
+          // spyOn(store, 'dispatch');
+        });
+        afterEach(() => {
+          lookupFixture.destroy();
+          lookupComp = null;
         });
+        it('should init component properly', fakeAsync(() => {
+          tick();
+          expect(lookupComp.firstInputValue).toBe('testDisplay');
+          expect((lookupComp as any).vocabularyService.getVocabularyEntryByID).toHaveBeenCalled();
+        }));
 
         it('should have search button disabled on edit mode', () => {
           lookupComp.editMode = true;
@@ -389,26 +428,26 @@ describe('Dynamic Lookup component', () => {
 
         it('should select a results entry properly', fakeAsync(() => {
           const payload = [
-            Object.assign(new AuthorityValue(), {
-              id: 1,
+            Object.assign(new VocabularyEntry(), {
+              authority: 1,
               display: 'Name, Lastname',
               value: 1
             }),
-            Object.assign(new AuthorityValue(), {
-              id: 2,
+            Object.assign(new VocabularyEntry(), {
+              authority: 2,
               display: 'NameTwo, LastnameTwo',
               value: 2
             }),
           ];
           let de = lookupFixture.debugElement.queryAll(By.css('button'));
           const btnEl = de[0].nativeElement;
-          const selectedValue = Object.assign(new AuthorityValue(), {
-            id: 1,
+          const selectedValue = Object.assign(new VocabularyEntry(), {
+            authority: 1,
             display: 'Name, Lastname',
             value: 1
           });
           spyOn(lookupComp.change, 'emit');
-          authorityServiceStub.setNewPayload(payload);
+          vocabularyServiceStub.setNewPayload(payload);
           lookupComp.firstInputValue = 'test';
           lookupFixture.detectChanges();
           btnEl.click();
@@ -433,6 +472,13 @@ describe('Dynamic Lookup component', () => {
           lookupComp.group = LOOKUP_TEST_GROUP;
           lookupComp.model = new DynamicLookupNameModel(LOOKUP_NAME_TEST_MODEL_CONFIG);
           lookupComp.model.value = new FormFieldMetadataValueObject('Name, Lastname', null, 'test001');
+          const entry = observableOf(Object.assign(new VocabularyEntry(), {
+            authority: null,
+            value: 'Name, Lastname',
+            display: 'Name, Lastname'
+          }));
+          spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
+          (lookupComp.model as any).value = new FormFieldMetadataValueObject('Name, Lastname', null, null, 'Name, Lastname');
           lookupFixture.detectChanges();
 
         });
@@ -440,10 +486,55 @@ describe('Dynamic Lookup component', () => {
           lookupFixture.destroy();
           lookupComp = null;
         });
-        it('should init component properly', () => {
+        it('should init component properly', fakeAsync(() => {
+          tick();
           expect(lookupComp.firstInputValue).toBe('Name');
           expect(lookupComp.secondInputValue).toBe('Lastname');
+          expect((lookupComp as any).vocabularyService.getVocabularyEntryByValue).toHaveBeenCalled();
+        }));
+
+        it('should have search button disabled on edit mode', () => {
+          lookupComp.editMode = true;
+          lookupFixture.detectChanges();
+
+          const de = lookupFixture.debugElement.queryAll(By.css('button'));
+          const searchBtnEl = de[0].nativeElement;
+          const saveBtnEl = de[1].nativeElement;
+          expect(searchBtnEl.disabled).toBe(true);
+          expect(saveBtnEl.disabled).toBe(false);
+          expect(saveBtnEl.textContent.trim()).toBe('form.save');
+
         });
+      });
+
+      describe('and init model value is not empty with authority', () => {
+        beforeEach(() => {
+
+          lookupFixture = TestBed.createComponent(DsDynamicLookupComponent);
+          lookupComp = lookupFixture.componentInstance; // FormComponent test instance
+          lookupComp.group = LOOKUP_TEST_GROUP;
+          lookupComp.model = new DynamicLookupNameModel(LOOKUP_NAME_TEST_MODEL_CONFIG);
+          lookupComp.model.value = new FormFieldMetadataValueObject('Name, Lastname', null, 'test001');
+          const entry = observableOf(Object.assign(new VocabularyEntry(), {
+            authority: 'test001',
+            value: 'Name, Lastname',
+            display: 'Name, Lastname'
+          }));
+          spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
+          lookupComp.model.value = new FormFieldMetadataValueObject('Name, Lastname', null, 'test001', 'Name, Lastname');
+          lookupFixture.detectChanges();
+
+        });
+        afterEach(() => {
+          lookupFixture.destroy();
+          lookupComp = null;
+        });
+        it('should init component properly', fakeAsync(() => {
+          tick();
+          expect(lookupComp.firstInputValue).toBe('Name');
+          expect(lookupComp.secondInputValue).toBe('Lastname');
+          expect((lookupComp as any).vocabularyService.getVocabularyEntryByID).toHaveBeenCalled();
+        }));
 
         it('should have search button disabled on edit mode', () => {
           lookupComp.editMode = true;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index d5516df6d94..9d7f0f370e7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -1,33 +1,34 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
-import { Subscription } from 'rxjs';
-import { of as observableOf } from 'rxjs';
+import { of as observableOf, Subscription } from 'rxjs';
 import { catchError, distinctUntilChanged } from 'rxjs/operators';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
-import {
-  DynamicFormControlComponent,
-  DynamicFormLayoutService,
-  DynamicFormValidationService
-} from '@ng-dynamic-forms/core';
-
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { DynamicLookupModel } from './dynamic-lookup.model';
-import { IntegrationSearchOptions } from '../../../../../../core/integration/models/integration-options.model';
-import { hasValue, isEmpty, isNotEmpty, isNull, isUndefined } from '../../../../../empty.util';
-import { IntegrationData } from '../../../../../../core/integration/integration-data';
+import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { hasValue, isEmpty, isNotEmpty } from '../../../../../empty.util';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
-import { ConfidenceType } from '../../../../../../core/integration/models/confidence-type';
-
+import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
+import {
+  PaginatedList,
+  buildPaginatedList
+} from '../../../../../../core/data/paginated-list.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+
+/**
+ * Component representing a lookup or lookup-name input field
+ */
 @Component({
   selector: 'ds-dynamic-lookup',
   styleUrls: ['./dynamic-lookup.component.scss'],
   templateUrl: './dynamic-lookup.component.html'
 })
-export class DsDynamicLookupComponent extends DynamicFormControlComponent implements OnDestroy, OnInit {
+export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
   @Input() bindId = true;
   @Input() group: FormGroup;
   @Input() model: any;
@@ -43,145 +44,101 @@ export class DsDynamicLookupComponent extends DynamicFormControlComponent implem
   public pageInfo: PageInfo;
   public optionsList: any;
 
-  protected searchOptions: IntegrationSearchOptions;
   protected subs: Subscription[] = [];
 
-  constructor(private authorityService: AuthorityService,
+  constructor(protected vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService
   ) {
-    super(layoutService, validationService);
+    super(vocabularyService, layoutService, validationService);
   }
 
+  /**
+   * Converts an item from the result list to a `string` to display in the `<input>` field.
+   */
   inputFormatter = (x: { display: string }, y: number) => {
     return y === 1 ? this.firstInputValue : this.secondInputValue;
   };
 
+  /**
+   * Initialize the component, setting up the init form value
+   */
   ngOnInit() {
-    this.searchOptions = new IntegrationSearchOptions(
-      this.model.authorityOptions.scope,
-      this.model.authorityOptions.name,
-      this.model.authorityOptions.metadata,
-      '',
-      this.model.maxOptions,
-      1);
-
-    this.setInputsValue(this.model.value);
+    if (isNotEmpty(this.model.value)) {
+      this.setCurrentValue(this.model.value, true);
+    }
 
     this.subs.push(this.model.valueUpdates
       .subscribe((value) => {
         if (isEmpty(value)) {
           this.resetFields();
         } else if (!this.editMode) {
-          this.setInputsValue(this.model.value);
+          this.setCurrentValue(this.model.value);
         }
       }));
   }
 
-  protected getCurrentValue(): string {
-    let result = '';
-    if (!this.isLookupName()) {
-      result = this.firstInputValue;
-    } else {
-      if (isNotEmpty(this.firstInputValue)) {
-        result = this.firstInputValue;
-      }
-      if (isNotEmpty(this.secondInputValue)) {
-        result = isEmpty(result)
-          ? this.secondInputValue
-          : this.firstInputValue + (this.model as DynamicLookupNameModel).separator + ' ' + this.secondInputValue;
-      }
-    }
-    return result;
-  }
-
-  protected resetFields() {
-    this.firstInputValue = '';
-    if (this.isLookupName()) {
-      this.secondInputValue = '';
-    }
-  }
-
-  protected setInputsValue(value) {
-    if (hasValue(value)) {
-      let displayValue = value;
-      if (value instanceof FormFieldMetadataValueObject || value instanceof AuthorityValue) {
-        displayValue = value.display;
-      }
-
-      if (hasValue(displayValue)) {
-        if (this.isLookupName()) {
-          const values = displayValue.split((this.model as DynamicLookupNameModel).separator);
-
-          this.firstInputValue = (values[0] || '').trim();
-          this.secondInputValue = (values[1] || '').trim();
-        } else {
-          this.firstInputValue = displayValue || '';
-        }
-      }
-    }
-  }
-
-  protected updateModel(value) {
-    this.group.markAsDirty();
-    this.model.valueUpdates.next(value);
-    this.setInputsValue(value);
-    this.change.emit(value);
-    this.optionsList = null;
-    this.pageInfo = null;
-  }
-
-  public formatItemForInput(item: any, field: number): string {
-    if (isUndefined(item) || isNull(item)) {
-      return '';
-    }
-    return (typeof item === 'string') ? item : this.inputFormatter(item, field);
-  }
-
+  /**
+   * Check if model value has an authority
+   */
   public hasAuthorityValue() {
     return hasValue(this.model.value)
+      && typeof this.model.value === 'object'
       && this.model.value.hasAuthority();
   }
 
+  /**
+   * Check if current value has an authority
+   */
   public hasEmptyValue() {
     return isNotEmpty(this.getCurrentValue());
   }
 
+  /**
+   * Clear inputs whether there is no results and authority is closed
+   */
   public clearFields() {
-    // Clear inputs whether there is no results and authority is closed
-    if (this.model.authorityOptions.closed) {
+    if (this.model.vocabularyOptions.closed) {
       this.resetFields();
     }
   }
 
+  /**
+   * Check if edit button is disabled
+   */
   public isEditDisabled() {
     return !this.hasAuthorityValue();
   }
 
+  /**
+   * Check if input is disabled
+   */
   public isInputDisabled() {
-    return (this.model.authorityOptions.closed && this.hasAuthorityValue() && !this.editMode);
+    return (this.model.vocabularyOptions.closed && this.hasAuthorityValue() && !this.editMode);
   }
 
+  /**
+   * Check if model is instanceof DynamicLookupNameModel
+   */
   public isLookupName() {
     return (this.model instanceof DynamicLookupNameModel);
   }
 
+  /**
+   * Check if search button is disabled
+   */
   public isSearchDisabled() {
     return isEmpty(this.firstInputValue) || this.editMode;
   }
 
-  public onBlurEvent(event: Event) {
-    this.blur.emit(event);
-  }
-
-  public onFocusEvent(event) {
-    this.focus.emit(event);
-  }
-
+  /**
+   * Update model value with the typed text if vocabulary is not closed
+   * @param event the typed text
+   */
   public onChange(event) {
     event.preventDefault();
-    if (!this.model.authorityOptions.closed) {
+    if (!this.model.vocabularyOptions.closed) {
       if (isNotEmpty(this.getCurrentValue())) {
         const currentValue = new FormFieldMetadataValueObject(this.getCurrentValue());
         if (!this.editMode) {
@@ -193,34 +150,54 @@ export class DsDynamicLookupComponent extends DynamicFormControlComponent implem
     }
   }
 
+  /**
+   * Load more result entries
+   */
   public onScroll() {
     if (!this.loading && this.pageInfo.currentPage <= this.pageInfo.totalPages) {
-      this.searchOptions.currentPage++;
+      this.updatePageInfo(
+        this.pageInfo.elementsPerPage,
+        this.pageInfo.currentPage + 1,
+        this.pageInfo.totalElements,
+        this.pageInfo.totalPages
+      );
       this.search();
     }
   }
 
+  /**
+   * Update model value with selected entry
+   * @param event the selected entry
+   */
   public onSelect(event) {
     this.updateModel(event);
   }
 
+  /**
+   * Reset the current value when dropdown toggle
+   */
   public openChange(isOpened: boolean) {
     if (!isOpened) {
-      if (this.model.authorityOptions.closed && !this.hasAuthorityValue()) {
-        this.setInputsValue('');
+      if (this.model.vocabularyOptions.closed && !this.hasAuthorityValue()) {
+        this.setCurrentValue('');
       }
     }
   }
 
+  /**
+   * Reset the model value
+   */
   public remove() {
     this.group.markAsPristine();
-    this.model.valueUpdates.next(null);
-    this.change.emit(null);
+    this.dispatchUpdate(null)
   }
 
+  /**
+   * Saves all changes
+   */
   public saveChanges() {
     if (isNotEmpty(this.getCurrentValue())) {
-      const newValue = Object.assign(new AuthorityValue(), this.model.value, {
+      const newValue = Object.assign(new VocabularyEntry(), this.model.value, {
         display: this.getCurrentValue(),
         value: this.getCurrentValue()
       });
@@ -231,35 +208,52 @@ export class DsDynamicLookupComponent extends DynamicFormControlComponent implem
     this.switchEditMode();
   }
 
+  /**
+   * Converts a stream of text values from the `<input>` element to the stream of the array of items
+   * to display in the result list.
+   */
   public search() {
     this.optionsList = null;
-    this.pageInfo = null;
-
-    // Query
-    this.searchOptions.query = this.getCurrentValue();
-
+    this.updatePageInfo(this.model.maxOptions, 1);
     this.loading = true;
-    this.subs.push(this.authorityService.getEntriesByName(this.searchOptions).pipe(
-      catchError(() => {
-        const emptyResult = new IntegrationData(
+
+    this.subs.push(this.vocabularyService.getVocabularyEntriesByValue(
+      this.getCurrentValue(),
+      false,
+      this.model.vocabularyOptions,
+      this.pageInfo
+    ).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      catchError(() =>
+        observableOf(buildPaginatedList(
           new PageInfo(),
           []
-        );
-        return observableOf(emptyResult);
-      }),
+        ))
+      ),
       distinctUntilChanged())
-      .subscribe((object: IntegrationData) => {
-        this.optionsList = object.payload;
-        this.pageInfo = object.pageInfo;
+      .subscribe((list: PaginatedList<VocabularyEntry>) => {
+        this.optionsList = list.page;
+        this.updatePageInfo(
+          list.pageInfo.elementsPerPage,
+          list.pageInfo.currentPage,
+          list.pageInfo.totalElements,
+          list.pageInfo.totalPages
+        );
         this.loading = false;
         this.cdr.detectChanges();
       }));
   }
 
+  /**
+   * Changes the edit mode flag
+   */
   public switchEditMode() {
     this.editMode = !this.editMode;
   }
 
+  /**
+   * Callback functions for whenClickOnConfidenceNotAccepted event
+   */
   public whenClickOnConfidenceNotAccepted(sdRef: NgbDropdown, confidence: ConfidenceType) {
     if (!this.model.readOnly) {
       sdRef.open();
@@ -272,4 +266,73 @@ export class DsDynamicLookupComponent extends DynamicFormControlComponent implem
       .filter((sub) => hasValue(sub))
       .forEach((sub) => sub.unsubscribe());
   }
+
+  /**
+   * Sets the current value with the given value.
+   * @param value The value to set.
+   * @param init Representing if is init value or not.
+   */
+  public setCurrentValue(value: any, init = false) {
+    if (init) {
+      this.getInitValueFromModel()
+        .subscribe((formValue: FormFieldMetadataValueObject) => this.setDisplayInputValue(formValue.display));
+    } else if (hasValue(value)) {
+      if (value instanceof FormFieldMetadataValueObject || value instanceof VocabularyEntry) {
+        this.setDisplayInputValue(value.display);
+      }
+    }
+  }
+
+  protected setDisplayInputValue(displayValue: string) {
+    if (hasValue(displayValue)) {
+      if (this.isLookupName()) {
+        const values = displayValue.split((this.model as DynamicLookupNameModel).separator);
+
+        this.firstInputValue = (values[0] || '').trim();
+        this.secondInputValue = (values[1] || '').trim();
+      } else {
+        this.firstInputValue = displayValue || '';
+      }
+      this.cdr.detectChanges();
+    }
+  }
+
+  /**
+   * Gets the current text present in the input field(s)
+   */
+  protected getCurrentValue(): string {
+    let result = '';
+    if (!this.isLookupName()) {
+      result = this.firstInputValue;
+    } else {
+      if (isNotEmpty(this.firstInputValue)) {
+        result = this.firstInputValue;
+      }
+      if (isNotEmpty(this.secondInputValue)) {
+        result = isEmpty(result)
+          ? this.secondInputValue
+          : this.firstInputValue + (this.model as DynamicLookupNameModel).separator + ' ' + this.secondInputValue;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Clear text present in the input field(s)
+   */
+  protected resetFields() {
+    this.firstInputValue = '';
+    if (this.isLookupName()) {
+      this.secondInputValue = '';
+    }
+  }
+
+  protected updateModel(value) {
+    this.group.markAsDirty();
+    this.dispatchUpdate(value);
+    this.setCurrentValue(value);
+    this.optionsList = null;
+    this.pageInfo = null;
+  }
+
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
similarity index 73%
rename from src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
rename to src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index 449481152d4..023fef665c2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -20,7 +20,7 @@
   </ul>
 </ng-template>
 
-<div class="position-relative right-addon">
+<div *ngIf="!(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
   <i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
   <i *ngIf="!searching"
      dsAuthorityConfidenceState
@@ -49,3 +49,20 @@
 
   <div class="invalid-feedback" *ngIf="searchFailed">Sorry, suggestions could not be loaded.</div>
 </div>
+
+<input *ngIf="(isHierarchicalVocabulary() | async)"
+       class="form-control custom-select"
+       [attr.autoComplete]="model.autoComplete"
+       [class.is-invalid]="showErrorMessages"
+       [dynamicId]="bindId && model.id"
+       [name]="model.name"
+       [placeholder]="model.placeholder"
+       [readonly]="model.readOnly"
+       [type]="model.inputType"
+       [value]="currentValue?.display"
+       (focus)="onFocus($event)"
+       (change)="onChange($event)"
+       (click)="openTree($event)"
+       (keydown)="$event.preventDefault()"
+       (keypress)="$event.preventDefault()"
+       (keyup)="$event.preventDefault()">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss
similarity index 87%
rename from src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.scss
rename to src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss
index 3857d96e78e..d6ce88eed90 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss
@@ -16,3 +16,8 @@
   color: $dropdown-link-hover-color !important;
   background-color: $dropdown-link-hover-bg !important;
 }
+
+.treeview .modal-body {
+  max-height: 85vh !important;
+  overflow-y: auto;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
new file mode 100644
index 00000000000..7a18bcc6e45
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
@@ -0,0 +1,462 @@
+// Load the implementations that should be tested
+import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { ComponentFixture, fakeAsync, inject, TestBed, tick, } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { CdkTreeModule } from '@angular/cdk/tree';
+
+import { TestScheduler } from 'rxjs/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { DsDynamicOneboxComponent } from './dynamic-onebox.component';
+import { DynamicOneboxModel } from './dynamic-onebox.model';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { AuthorityConfidenceStateDirective } from '../../../../../authority-confidence/authority-confidence-state.directive';
+import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
+import { VocabularyTreeviewComponent } from '../../../../../vocabulary-treeview/vocabulary-treeview.component';
+
+export let ONEBOX_TEST_GROUP;
+
+export let ONEBOX_TEST_MODEL_CONFIG;
+
+/* tslint:disable:max-classes-per-file */
+
+// Mock class for NgbModalRef
+export class MockNgbModalRef {
+  componentInstance = {
+    vocabularyOptions: undefined,
+    preloadLevel: undefined,
+    selectedItem: undefined
+  };
+  result: Promise<any> = new Promise((resolve, reject) => resolve(true));
+}
+
+function init() {
+  ONEBOX_TEST_GROUP = new FormGroup({
+    onebox: new FormControl(),
+  });
+
+  ONEBOX_TEST_MODEL_CONFIG = {
+    vocabularyOptions: {
+      closed: false,
+      name: 'vocabulary'
+    } as VocabularyOptions,
+    disabled: false,
+    id: 'onebox',
+    label: 'Conference',
+    minChars: 3,
+    name: 'onebox',
+    placeholder: 'Conference',
+    readOnly: false,
+    required: false,
+    repeatable: false,
+    value: undefined
+  };
+}
+
+describe('DsDynamicOneboxComponent test suite', () => {
+
+  let scheduler: TestScheduler;
+  let testComp: TestComponent;
+  let oneboxComponent: DsDynamicOneboxComponent;
+  let testFixture: ComponentFixture<TestComponent>;
+  let oneboxCompFixture: ComponentFixture<DsDynamicOneboxComponent>;
+  let vocabularyServiceStub: any;
+  let modalService: any;
+  let html;
+  let modal;
+  const vocabulary = {
+    id: 'vocabulary',
+    name: 'vocabulary',
+    scrollable: true,
+    hierarchical: false,
+    preloadLevel: 0,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        url: 'self'
+      },
+      entries: {
+        url: 'entries'
+      }
+    }
+  }
+
+  const hierarchicalVocabulary = {
+    id: 'hierarchicalVocabulary',
+    name: 'hierarchicalVocabulary',
+    scrollable: true,
+    hierarchical: true,
+    preloadLevel: 2,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        url: 'self'
+      },
+      entries: {
+        url: 'entries'
+      }
+    }
+  }
+
+  // async beforeEach
+  beforeEach(() => {
+    vocabularyServiceStub = new VocabularyServiceStub();
+
+    modal = jasmine.createSpyObj('modal',
+      {
+        open: jasmine.createSpy('open'),
+        close: jasmine.createSpy('close'),
+        dismiss: jasmine.createSpy('dismiss'),
+      }
+    );
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        DynamicFormsCoreModule,
+        DynamicFormsNGBootstrapUIModule,
+        FormsModule,
+        NgbModule,
+        ReactiveFormsModule,
+        TranslateModule.forRoot(),
+        CdkTreeModule
+      ],
+      declarations: [
+        DsDynamicOneboxComponent,
+        TestComponent,
+        AuthorityConfidenceStateDirective,
+        ObjNgFor,
+        VocabularyTreeviewComponent
+      ], // declare the test component
+      providers: [
+        ChangeDetectorRef,
+        DsDynamicOneboxComponent,
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
+        { provide: DynamicFormLayoutService, useValue: {} },
+        { provide: DynamicFormValidationService, useValue: {} },
+        { provide: NgbModal, useValue: modal }
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+
+    });
+
+  describe('', () => {
+    // synchronous beforeEach
+    beforeEach(() => {
+      html = `
+      <ds-dynamic-onebox [bindId]="bindId"
+                            [group]="group"
+                            [model]="model"
+                            (blur)="onBlur($event)"
+                            (change)="onValueChange($event)"
+                            (focus)="onFocus($event)"></ds-dynamic-onebox>`;
+
+      spyOn(vocabularyServiceStub, 'findVocabularyById').and.returnValue(createSuccessfulRemoteDataObject$(vocabulary));
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+    it('should create DsDynamicOneboxComponent', inject([DsDynamicOneboxComponent], (app: DsDynamicOneboxComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Has not hierarchical vocabulary', () => {
+    beforeEach(() => {
+      spyOn(vocabularyServiceStub, 'findVocabularyById').and.returnValue(createSuccessfulRemoteDataObject$(vocabulary));
+    });
+
+    describe('when init model value is empty', () => {
+      beforeEach(() => {
+
+        oneboxCompFixture = TestBed.createComponent(DsDynamicOneboxComponent);
+        oneboxComponent = oneboxCompFixture.componentInstance; // FormComponent test instance
+        oneboxComponent.group = ONEBOX_TEST_GROUP;
+        oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+        oneboxCompFixture.detectChanges();
+      });
+
+      afterEach(() => {
+        oneboxCompFixture.destroy();
+        oneboxComponent = null;
+      });
+
+      it('should init component properly', () => {
+        expect(oneboxComponent.currentValue).not.toBeDefined();
+      });
+
+      it('should search when 3+ characters typed', fakeAsync(() => {
+
+        spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntriesByValue').and.callThrough();
+
+        oneboxComponent.search(observableOf('test')).subscribe();
+
+        tick(300);
+        oneboxCompFixture.detectChanges();
+
+        expect((oneboxComponent as any).vocabularyService.getVocabularyEntriesByValue).toHaveBeenCalled();
+      }));
+
+      it('should set model.value on input type when VocabularyOptions.closed is false', () => {
+        const inputDe = oneboxCompFixture.debugElement.query(By.css('input.form-control'));
+        const inputElement = inputDe.nativeElement;
+
+        inputElement.value = 'test value';
+        inputElement.dispatchEvent(new Event('input'));
+
+        expect(oneboxComponent.inputValue).toEqual(new FormFieldMetadataValueObject('test value'))
+
+      });
+
+      it('should not set model.value on input type when VocabularyOptions.closed is true', () => {
+        oneboxComponent.model.vocabularyOptions.closed = true;
+        oneboxCompFixture.detectChanges();
+        const inputDe = oneboxCompFixture.debugElement.query(By.css('input.form-control'));
+        const inputElement = inputDe.nativeElement;
+
+        inputElement.value = 'test value';
+        inputElement.dispatchEvent(new Event('input'));
+
+        expect(oneboxComponent.model.value).not.toBeDefined();
+
+      });
+
+      it('should emit blur Event onBlur when popup is closed', () => {
+        spyOn(oneboxComponent.blur, 'emit');
+        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        oneboxComponent.onBlur(new Event('blur'));
+        expect(oneboxComponent.blur.emit).toHaveBeenCalled();
+      });
+
+      it('should not emit blur Event onBlur when popup is opened', () => {
+        spyOn(oneboxComponent.blur, 'emit');
+        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(true);
+        const input = oneboxCompFixture.debugElement.query(By.css('input'));
+
+        input.nativeElement.blur();
+        expect(oneboxComponent.blur.emit).not.toHaveBeenCalled();
+      });
+
+      it('should emit change Event onBlur when VocabularyOptions.closed is false and inputValue is changed', () => {
+        oneboxComponent.inputValue = 'test value';
+        oneboxCompFixture.detectChanges();
+        spyOn(oneboxComponent.blur, 'emit');
+        spyOn(oneboxComponent.change, 'emit');
+        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        oneboxComponent.onBlur(new Event('blur',));
+        expect(oneboxComponent.change.emit).toHaveBeenCalled();
+        expect(oneboxComponent.blur.emit).toHaveBeenCalled();
+      });
+
+      it('should not emit change Event onBlur when VocabularyOptions.closed is false and inputValue is not changed', () => {
+        oneboxComponent.inputValue = 'test value';
+        oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+        (oneboxComponent.model as any).value = 'test value';
+        oneboxCompFixture.detectChanges();
+        spyOn(oneboxComponent.blur, 'emit');
+        spyOn(oneboxComponent.change, 'emit');
+        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        oneboxComponent.onBlur(new Event('blur',));
+        expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
+        expect(oneboxComponent.blur.emit).toHaveBeenCalled();
+      });
+
+      it('should not emit change Event onBlur when VocabularyOptions.closed is false and inputValue is null', () => {
+        oneboxComponent.inputValue = null;
+        oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+        (oneboxComponent.model as any).value = 'test value';
+        oneboxCompFixture.detectChanges();
+        spyOn(oneboxComponent.blur, 'emit');
+        spyOn(oneboxComponent.change, 'emit');
+        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        oneboxComponent.onBlur(new Event('blur',));
+        expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
+        expect(oneboxComponent.blur.emit).toHaveBeenCalled();
+      });
+
+      it('should emit focus Event onFocus', () => {
+        spyOn(oneboxComponent.focus, 'emit');
+        oneboxComponent.onFocus(new Event('focus'));
+        expect(oneboxComponent.focus.emit).toHaveBeenCalled();
+      });
+
+    });
+
+    describe('when init model value is not empty', () => {
+      beforeEach(() => {
+        oneboxCompFixture = TestBed.createComponent(DsDynamicOneboxComponent);
+        oneboxComponent = oneboxCompFixture.componentInstance; // FormComponent test instance
+        oneboxComponent.group = ONEBOX_TEST_GROUP;
+        oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+        const entry = observableOf(Object.assign(new VocabularyEntry(), {
+          authority: null,
+          value: 'test',
+          display: 'testDisplay'
+        }));
+        spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
+        spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
+        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, null, 'testDisplay');
+        oneboxCompFixture.detectChanges();
+      });
+
+      afterEach(() => {
+        oneboxCompFixture.destroy();
+        oneboxComponent = null;
+      });
+
+      it('should init component properly', fakeAsync(() => {
+        tick();
+        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null, 'testDisplay'));
+        expect((oneboxComponent as any).vocabularyService.getVocabularyEntryByValue).toHaveBeenCalled();
+      }));
+
+      it('should emit change Event onChange and currentValue is empty', () => {
+        oneboxComponent.currentValue = null;
+        spyOn(oneboxComponent.change, 'emit');
+        oneboxComponent.onChange(new Event('change'));
+        expect(oneboxComponent.change.emit).toHaveBeenCalled();
+        expect(oneboxComponent.model.value).toBeNull();
+      });
+    });
+
+    describe('when init model value is not empty and has authority', () => {
+      beforeEach(() => {
+        oneboxCompFixture = TestBed.createComponent(DsDynamicOneboxComponent);
+        oneboxComponent = oneboxCompFixture.componentInstance; // FormComponent test instance
+        oneboxComponent.group = ONEBOX_TEST_GROUP;
+        oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+        const entry = observableOf(Object.assign(new VocabularyEntry(), {
+          authority: 'test001',
+          value: 'test001',
+          display: 'test'
+        }));
+        spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
+        spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
+        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, 'test001');
+        oneboxCompFixture.detectChanges();
+      });
+
+      afterEach(() => {
+        oneboxCompFixture.destroy();
+        oneboxComponent = null;
+      });
+
+      it('should init component properly', fakeAsync(() => {
+        tick();
+        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test001', null, 'test001', 'test'));
+        expect((oneboxComponent as any).vocabularyService.getVocabularyEntryByID).toHaveBeenCalled();
+      }));
+
+      it('should emit change Event onChange and currentValue is empty', () => {
+        oneboxComponent.currentValue = null;
+        spyOn(oneboxComponent.change, 'emit');
+        oneboxComponent.onChange(new Event('change'));
+        expect(oneboxComponent.change.emit).toHaveBeenCalled();
+        expect(oneboxComponent.model.value).toBeNull();
+      });
+    });
+  });
+
+  describe('Has hierarchical vocabulary', () => {
+    beforeEach(() => {
+      scheduler = getTestScheduler();
+      spyOn(vocabularyServiceStub, 'findVocabularyById').and.returnValue(createSuccessfulRemoteDataObject$(hierarchicalVocabulary));
+      oneboxCompFixture = TestBed.createComponent(DsDynamicOneboxComponent);
+      oneboxComponent = oneboxCompFixture.componentInstance; // FormComponent test instance
+      modalService = TestBed.get(NgbModal);
+      modalService.open.and.returnValue(new MockNgbModalRef());
+    });
+
+    describe('when init model value is empty', () => {
+      beforeEach(() => {
+        oneboxComponent.group = ONEBOX_TEST_GROUP;
+        oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+        oneboxCompFixture.detectChanges();
+      });
+
+      afterEach(() => {
+        oneboxCompFixture.destroy();
+        oneboxComponent = null;
+      });
+
+      it('should init component properly', fakeAsync(() => {
+        tick();
+        expect(oneboxComponent.currentValue).not.toBeDefined();
+      }));
+
+      it('should open tree properly', (done) => {
+        scheduler.schedule(() => oneboxComponent.openTree(new Event('click')));
+        scheduler.flush();
+
+        expect((oneboxComponent as any).modalService.open).toHaveBeenCalled();
+        done();
+      });
+    });
+
+    describe('when init model value is not empty', () => {
+      beforeEach(() => {
+        oneboxComponent.group = ONEBOX_TEST_GROUP;
+        oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+        const entry = observableOf(Object.assign(new VocabularyEntry(), {
+          authority: null,
+          value: 'test',
+          display: 'testDisplay'
+        }));
+        spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
+        spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
+        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, null, 'testDisplay');
+        oneboxCompFixture.detectChanges();
+      });
+
+      afterEach(() => {
+        oneboxCompFixture.destroy();
+        oneboxComponent = null;
+      });
+
+      it('should init component properly', fakeAsync(() => {
+        tick();
+        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null, 'testDisplay'));
+        expect((oneboxComponent as any).vocabularyService.getVocabularyEntryByValue).toHaveBeenCalled();
+      }));
+
+      it('should open tree properly', (done) => {
+        scheduler.schedule(() => oneboxComponent.openTree(new Event('click')));
+        scheduler.flush();
+
+        expect((oneboxComponent as any).modalService.open).toHaveBeenCalled();
+        done();
+      });
+    });
+
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+  group: FormGroup = ONEBOX_TEST_GROUP;
+
+  model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+
+}
+
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
new file mode 100644
index 00000000000..9bd19c49a48
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -0,0 +1,281 @@
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+
+import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  catchError,
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  map,
+  merge,
+  switchMap,
+  take,
+  tap
+} from 'rxjs/operators';
+import { Observable, of as observableOf, Subject, Subscription } from 'rxjs';
+import { NgbModal, NgbModalRef, NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
+
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DynamicOneboxModel } from './dynamic-onebox.model';
+import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../../../empty.util';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import {
+  PaginatedList,
+  buildPaginatedList
+} from '../../../../../../core/data/paginated-list.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { Vocabulary } from '../../../../../../core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyTreeviewComponent } from '../../../../../vocabulary-treeview/vocabulary-treeview.component';
+import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+
+/**
+ * Component representing a onebox input field.
+ * If field has a Hierarchical Vocabulary configured, it's rendered with vocabulary tree
+ */
+@Component({
+  selector: 'ds-dynamic-onebox',
+  styleUrls: ['./dynamic-onebox.component.scss'],
+  templateUrl: './dynamic-onebox.component.html'
+})
+export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnInit {
+  @Input() bindId = true;
+  @Input() group: FormGroup;
+  @Input() model: DynamicOneboxModel;
+
+  @Output() blur: EventEmitter<any> = new EventEmitter<any>();
+  @Output() change: EventEmitter<any> = new EventEmitter<any>();
+  @Output() focus: EventEmitter<any> = new EventEmitter<any>();
+
+  @ViewChild('instance', { static: false }) instance: NgbTypeahead;
+
+  pageInfo: PageInfo = new PageInfo();
+  searching = false;
+  searchFailed = false;
+  hideSearchingWhenUnsubscribed$ = new Observable(() => () => this.changeSearchingStatus(false));
+  click$ = new Subject<string>();
+  currentValue: any;
+  inputValue: any;
+  preloadLevel: number;
+
+  private vocabulary$: Observable<Vocabulary>;
+  private isHierarchicalVocabulary$: Observable<boolean>;
+  private subs: Subscription[] = [];
+
+  constructor(protected vocabularyService: VocabularyService,
+              protected cdr: ChangeDetectorRef,
+              protected layoutService: DynamicFormLayoutService,
+              protected modalService: NgbModal,
+              protected validationService: DynamicFormValidationService
+  ) {
+    super(vocabularyService, layoutService, validationService);
+  }
+
+  /**
+   * Converts an item from the result list to a `string` to display in the `<input>` field.
+   */
+  formatter = (x: { display: string }) => {
+    return (typeof x === 'object') ? x.display : x
+  };
+
+  /**
+   * Converts a stream of text values from the `<input>` element to the stream of the array of items
+   * to display in the onebox popup.
+   */
+  search = (text$: Observable<string>) => {
+    return text$.pipe(
+      merge(this.click$),
+      debounceTime(300),
+      distinctUntilChanged(),
+      tap(() => this.changeSearchingStatus(true)),
+      switchMap((term) => {
+        if (term === '' || term.length < this.model.minChars) {
+          return observableOf({ list: [] });
+        } else {
+          return this.vocabularyService.getVocabularyEntriesByValue(
+            term,
+            false,
+            this.model.vocabularyOptions,
+            this.pageInfo).pipe(
+            getFirstSucceededRemoteDataPayload(),
+            tap(() => this.searchFailed = false),
+            catchError(() => {
+              this.searchFailed = true;
+              return observableOf(buildPaginatedList(
+                new PageInfo(),
+                []
+              ));
+            }));
+        }
+      }),
+      map((list: PaginatedList<VocabularyEntry>) => list.page),
+      tap(() => this.changeSearchingStatus(false)),
+      merge(this.hideSearchingWhenUnsubscribed$)
+    )
+  };
+
+  /**
+   * Initialize the component, setting up the init form value
+   */
+  ngOnInit() {
+    if (this.model.value) {
+      this.setCurrentValue(this.model.value, true);
+    }
+
+    this.vocabulary$ = this.vocabularyService.findVocabularyById(this.model.vocabularyOptions.name).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      distinctUntilChanged()
+    );
+
+    this.isHierarchicalVocabulary$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => result.hierarchical)
+    );
+
+    this.subs.push(this.group.get(this.model.id).valueChanges.pipe(
+      filter((value) => this.currentValue !== value))
+      .subscribe((value) => {
+        this.setCurrentValue(this.model.value);
+      }));
+  }
+
+  /**
+   * Changes the searching status
+   * @param status
+   */
+  changeSearchingStatus(status: boolean) {
+    this.searching = status;
+    this.cdr.detectChanges();
+  }
+
+  /**
+   * Checks if configured vocabulary is Hierarchical or not
+   */
+  isHierarchicalVocabulary(): Observable<boolean> {
+    return this.isHierarchicalVocabulary$;
+  }
+
+  /**
+   * Update the input value with a FormFieldMetadataValueObject
+   * @param event
+   */
+  onInput(event) {
+    if (!this.model.vocabularyOptions.closed && isNotEmpty(event.target.value)) {
+      this.inputValue = new FormFieldMetadataValueObject(event.target.value);
+    }
+  }
+
+  /**
+   * Emits a blur event containing a given value.
+   * @param event The value to emit.
+   */
+  onBlur(event: Event) {
+    if (!this.instance.isPopupOpen()) {
+      if (!this.model.vocabularyOptions.closed && isNotEmpty(this.inputValue)) {
+        if (isNotNull(this.inputValue) && this.model.value !== this.inputValue) {
+          this.dispatchUpdate(this.inputValue);
+        }
+        this.inputValue = null;
+      }
+      this.blur.emit(event);
+    } else {
+      // prevent on blur propagation if typeahed suggestions are showed
+      event.preventDefault();
+      event.stopImmediatePropagation();
+      // set focus on input again, this is to avoid to lose changes when no suggestion is selected
+      (event.target as HTMLInputElement).focus();
+    }
+  }
+
+  /**
+   * Updates model value with the current value
+   * @param event The change event.
+   */
+  onChange(event: Event) {
+    event.stopPropagation();
+    if (isEmpty(this.currentValue)) {
+      this.dispatchUpdate(null);
+    }
+  }
+
+  /**
+   * Updates current value and model value with the selected value.
+   * @param event The value to set.
+   */
+  onSelectItem(event: NgbTypeaheadSelectItemEvent) {
+    this.inputValue = null;
+    this.setCurrentValue(event.item);
+    this.dispatchUpdate(event.item);
+  }
+
+  /**
+   * Open modal to show tree for hierarchical vocabulary
+   * @param event The click event fired
+   */
+  openTree(event) {
+    event.preventDefault();
+    event.stopImmediatePropagation();
+    this.subs.push(this.vocabulary$.pipe(
+      map((vocabulary: Vocabulary) => vocabulary.preloadLevel),
+      take(1)
+    ).subscribe((preloadLevel) => {
+      const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewComponent, { size: 'lg', windowClass: 'treeview' });
+      modalRef.componentInstance.vocabularyOptions = this.model.vocabularyOptions;
+      modalRef.componentInstance.preloadLevel = preloadLevel;
+      modalRef.componentInstance.selectedItem = this.currentValue ? this.currentValue : '';
+      modalRef.result.then((result: VocabularyEntryDetail) => {
+        if (result) {
+          this.currentValue = result;
+          this.dispatchUpdate(result);
+        }
+      }, () => {
+        return;
+      });
+    }))
+  }
+
+  /**
+   * Callback functions for whenClickOnConfidenceNotAccepted event
+   */
+  public whenClickOnConfidenceNotAccepted(confidence: ConfidenceType) {
+    if (!this.model.readOnly) {
+      this.click$.next(this.formatter(this.currentValue));
+    }
+  }
+
+  /**
+   * Sets the current value with the given value.
+   * @param value The value to set.
+   * @param init Representing if is init value or not.
+   */
+  setCurrentValue(value: any, init = false): void {
+    let result: string;
+    if (init) {
+      this.getInitValueFromModel()
+        .subscribe((formValue: FormFieldMetadataValueObject) => {
+          this.currentValue = formValue;
+          this.cdr.detectChanges();
+        });
+    } else {
+      if (isEmpty(value)) {
+        result = '';
+      } else {
+        result = value.value;
+      }
+
+      this.currentValue = result;
+      this.cdr.detectChanges();
+    }
+
+  }
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
similarity index 58%
rename from src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.model.ts
rename to src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
index 866055ed048..4b973e30583 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
@@ -1,19 +1,19 @@
 import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
 
-export const DYNAMIC_FORM_CONTROL_TYPE_TYPEAHEAD = 'TYPEAHEAD';
+export const DYNAMIC_FORM_CONTROL_TYPE_ONEBOX = 'ONEBOX';
 
-export interface DsDynamicTypeaheadModelConfig extends DsDynamicInputModelConfig {
+export interface DsDynamicOneboxModelConfig extends DsDynamicInputModelConfig {
   minChars?: number;
   value?: any;
 }
 
-export class DynamicTypeaheadModel extends DsDynamicInputModel {
+export class DynamicOneboxModel extends DsDynamicInputModel {
 
   @serializable() minChars: number;
-  @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_TYPEAHEAD;
+  @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_ONEBOX;
 
-  constructor(config: DsDynamicTypeaheadModelConfig, layout?: DynamicFormControlLayout) {
+  constructor(config: DsDynamicOneboxModelConfig, layout?: DynamicFormControlLayout) {
 
     super(config, layout);
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
index bcddb521234..8fc579fb1b4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -2,9 +2,12 @@
 import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, inject, TestBed, } from '@angular/core/testing';
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
+import { Store, StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
 import { DsDynamicRelationGroupComponent } from './dynamic-relation-group.components';
 import { DynamicRelationGroupModel, DynamicRelationGroupModelConfig } from './dynamic-relation-group.model';
@@ -13,18 +16,14 @@ import { FormFieldModel } from '../../../models/form-field.model';
 import { FormBuilderService } from '../../../form-builder.service';
 import { FormService } from '../../../../form.service';
 import { FormComponent } from '../../../../form.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Chips } from '../../../../../chips/models/chips.model';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicInputModel } from '../ds-dynamic-input.model';
 import { createTestComponent } from '../../../../../testing/utils.test';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { AuthorityServiceStub } from '../../../../../testing/authority-service.stub';
-import { Store, StoreModule } from '@ngrx/store';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { StoreMock } from '../../../../../testing/store.mock';
 import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
-import { GlobalConfig } from '../../../../../../../config/global-config.interface';
 import { storeModuleConfig } from '../../../../../../app.reducer';
 
 export let FORM_GROUP_TEST_MODEL_CONFIG;
@@ -47,7 +46,7 @@ function init() {
         mandatoryMessage: 'Required field!',
         repeatable: false,
         selectableMetadata: [{
-          authority: 'RPAuthority',
+          controlledVocabulary: 'RPAuthority',
           closed: false,
           metadata: 'dc.contributor.author'
         }],
@@ -61,7 +60,7 @@ function init() {
         mandatory: 'false',
         repeatable: false,
         selectableMetadata: [{
-          authority: 'OUAuthority',
+          controlledVocabulary: 'OUAuthority',
           closed: false,
           metadata: 'local.contributor.affiliation'
         }]
@@ -80,7 +79,8 @@ function init() {
     submissionScope: undefined,
     validators: { required: null },
     repeatable: false,
-    metadataFields: []
+    metadataFields: [],
+    hasSelectableMetadata: false
   } as DynamicRelationGroupModelConfig;
 
   FORM_GROUP_TEST_GROUP = new FormGroup({
@@ -128,7 +128,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         FormBuilderService,
         FormComponent,
         FormService,
-        { provide: AuthorityService, useValue: new AuthorityServiceStub() },
+        { provide: VocabularyService, useValue: new VocabularyServiceStub() },
         { provide: Store, useClass: StoreMock }
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index 11085a1bc30..4f6c7764975 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -1,14 +1,4 @@
-import {
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Inject,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild
-} from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
 import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
@@ -23,7 +13,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { isEqual, isObject } from 'lodash';
 
-import { DynamicRelationGroupModel, PLACEHOLDER_PARENT_METADATA } from './dynamic-relation-group.model';
+import { DynamicRelationGroupModel} from './dynamic-relation-group.model';
 import { FormBuilderService } from '../../../form-builder.service';
 import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
 import { FormService } from '../../../../form.service';
@@ -33,13 +23,16 @@ import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../../../empty.u
 import { shrinkInOut } from '../../../../../animations/shrink';
 import { ChipsItem } from '../../../../../chips/models/chips-item.model';
 import { hasOnlyEmptyProperties } from '../../../../../object.util';
-import { IntegrationSearchOptions } from '../../../../../../core/integration/models/integration-options.model';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { IntegrationData } from '../../../../../../core/integration/integration-data';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
 import { environment } from '../../../../../../../environments/environment';
+import { PLACEHOLDER_PARENT_METADATA } from '../../ds-dynamic-form-constants';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 
+/**
+ * Component representing a group input field
+ */
 @Component({
   selector: 'ds-dynamic-relation-group',
   styleUrls: ['./dynamic-relation-group.component.scss'],
@@ -64,9 +57,9 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
   private selectedChipItem: ChipsItem;
   private subs: Subscription[] = [];
 
-  @ViewChild('formRef', {static: false}) private formRef: FormComponent;
+  @ViewChild('formRef', { static: false }) private formRef: FormComponent;
 
-  constructor(private authorityService: AuthorityService,
+  constructor(private vocabularyService: VocabularyService,
               private formBuilderService: FormBuilderService,
               private formService: FormService,
               private cdr: ChangeDetectorRef,
@@ -177,6 +170,12 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
     this.clear();
   }
 
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
   private addToChips() {
     if (!this.formRef.formGroup.valid) {
       this.formService.validateAllFormFields(this.formRef.formGroup);
@@ -235,20 +234,16 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
               if (isObject(valueObj[fieldName]) && valueObj[fieldName].hasAuthority() && isNotEmpty(valueObj[fieldName].authority)) {
                 const fieldId = fieldName.replace(/\./g, '_');
                 const model = this.formBuilderService.findById(fieldId, this.formModel);
-                const searchOptions: IntegrationSearchOptions = new IntegrationSearchOptions(
-                  (model as any).authorityOptions.scope,
-                  (model as any).authorityOptions.name,
-                  (model as any).authorityOptions.metadata,
+                return$ = this.vocabularyService.findEntryDetailById(
                   valueObj[fieldName].authority,
-                  (model as any).maxOptions,
-                  1);
-
-                return$ = this.authorityService.getEntryByValue(searchOptions).pipe(
-                  map((result: IntegrationData) => Object.assign(
+                  (model as any).vocabularyOptions.name
+                ).pipe(
+                  getFirstSucceededRemoteDataPayload(),
+                  map((entryDetail: VocabularyEntryDetail) => Object.assign(
                     new FormFieldMetadataValueObject(),
                     valueObj[fieldName],
                     {
-                      otherInformation: (result.payload[0] as AuthorityValue).otherInformation
+                      otherInformation: entryDetail.otherInformation
                     })
                   ));
               } else {
@@ -315,10 +310,4 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
     }
   }
 
-  ngOnDestroy(): void {
-    this.subs
-      .filter((sub) => hasValue(sub))
-      .forEach((sub) => sub.unsubscribe());
-  }
-
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
index c1f76f04315..afa03a8e4ec 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
@@ -2,9 +2,7 @@ import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
 import { isEmpty, isNull } from '../../../../../empty.util';
 import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
-
-export const DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP = 'RELATION';
-export const PLACEHOLDER_PARENT_METADATA = '#PLACEHOLDER_PARENT_METADATA_VALUE#';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../../ds-dynamic-form-constants';
 
 /**
  * Dynamic Group Model configuration interface
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index cfe50def987..f40d58bb0e1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -1,5 +1,5 @@
-<div #sdRef="ngbDropdown" ngbDropdown class="input-group w-100">
-  <input class="form-control"
+<div #sdRef="ngbDropdown" ngbDropdown class="w-100">
+  <input ngbDropdownToggle class="form-control custom-select"
          [attr.autoComplete]="model.autoComplete"
          [class.is-invalid]="showErrorMessages"
          [dynamicId]="bindId && model.id"
@@ -11,12 +11,6 @@
          (click)="$event.stopPropagation(); openDropdown(sdRef);"
          (focus)="onFocus($event)"
          (keypress)="$event.preventDefault()">
-    <button aria-describedby="collectionControlsMenuLabel"
-            class="ds-form-input-btn  btn btn-outline-primary"
-            id="scrollableDropdownMenuButton_{{model.id}}"
-            ngbDropdownToggle
-            [disabled]="model.readOnly"
-            (click)="onToggle(sdRef); $event.stopPropagation();"></button>
 
   <div ngbDropdownMenu
        class="dropdown-menu scrollable-dropdown-menu w-100"
@@ -32,7 +26,7 @@
          [scrollWindow]="false">
 
       <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
-      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList" (click)="onSelect(listEntry)" title="{{ listEntry.display }}">
+      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList" (click)="onSelect(listEntry); sdRef.close()" title="{{ listEntry.display }}">
         {{inputFormatter(listEntry)}}
       </button>
       <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 6086444264f..9dbeb41ae89 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -9,12 +9,12 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { AuthorityServiceStub } from '../../../../../testing/authority-service.stub';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { DsDynamicScrollableDropdownComponent } from './dynamic-scrollable-dropdown.component';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { createTestComponent, hasClass } from '../../../../../testing/utils.test';
 
 export const SD_TEST_GROUP = new FormGroup({
@@ -22,14 +22,12 @@ export const SD_TEST_GROUP = new FormGroup({
 });
 
 export const SD_TEST_MODEL_CONFIG = {
-  authorityOptions: {
+  vocabularyOptions: {
     closed: false,
-    metadata: 'dropdown',
-    name: 'common_iso_languages',
-    scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-  } as AuthorityOptions,
+    name: 'common_iso_languages'
+  } as VocabularyOptions,
   disabled: false,
-  errorMessages: {required: 'Required field.'},
+  errorMessages: { required: 'Required field.' },
   id: 'dropdown',
   label: 'Language',
   maxOptions: 10,
@@ -40,7 +38,8 @@ export const SD_TEST_MODEL_CONFIG = {
   repeatable: false,
   value: undefined,
   metadataFields: [],
-  submissionId: '1234'
+  submissionId: '1234',
+  hasSelectableMetadata: false
 };
 
 describe('Dynamic Dynamic Scrollable Dropdown component', () => {
@@ -52,7 +51,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
   let html;
   let modelValue;
 
-  const authorityServiceStub = new AuthorityServiceStub();
+  const vocabularyServiceStub = new VocabularyServiceStub();
 
   // async beforeEach
   beforeEach(async(() => {
@@ -74,9 +73,9 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
       providers: [
         ChangeDetectorRef,
         DsDynamicScrollableDropdownComponent,
-        {provide: AuthorityService, useValue: authorityServiceStub},
-        {provide: DynamicFormLayoutService, useValue: {}},
-        {provide: DynamicFormValidationService, useValue: {}}
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
+        { provide: DynamicFormLayoutService, useValue: {} },
+        { provide: DynamicFormValidationService, useValue: {} }
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
@@ -121,15 +120,12 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
       });
 
       it('should init component properly', () => {
-        const results$ = authorityServiceStub.getEntriesByName({} as  any);
         expect(scrollableDropdownComp.optionsList).toBeDefined();
-        results$.subscribe((results) => {
-          expect(scrollableDropdownComp.optionsList).toEqual(results.payload);
-        })
+        expect(scrollableDropdownComp.optionsList).toEqual(vocabularyServiceStub.getList());
       });
 
       it('should display dropdown menu entries', () => {
-        const de = scrollableDropdownFixture.debugElement.query(By.css('button.ds-form-input-btn'));
+        const de = scrollableDropdownFixture.debugElement.query(By.css('input.custom-select'));
         const btnEl = de.nativeElement;
 
         const deMenu = scrollableDropdownFixture.debugElement.query(By.css('div.scrollable-dropdown-menu'));
@@ -154,9 +150,9 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
       }));
 
       it('should select a results entry properly', fakeAsync(() => {
-        const selectedValue = Object.assign(new AuthorityValue(), {id: 1, display: 'one', value: 1});
+        const selectedValue = Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 });
 
-        let de: any = scrollableDropdownFixture.debugElement.query(By.css('button.ds-form-input-btn'));
+        let de: any = scrollableDropdownFixture.debugElement.query(By.css('input.custom-select'));
         let btnEl = de.nativeElement;
 
         btnEl.click();
@@ -192,7 +188,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         scrollableDropdownFixture = TestBed.createComponent(DsDynamicScrollableDropdownComponent);
         scrollableDropdownComp = scrollableDropdownFixture.componentInstance; // FormComponent test instance
         scrollableDropdownComp.group = SD_TEST_GROUP;
-        modelValue = Object.assign(new AuthorityValue(), {id: 1, display: 'one', value: 1});
+        modelValue = Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 });
         scrollableDropdownComp.model = new DynamicScrollableDropdownModel(SD_TEST_MODEL_CONFIG);
         scrollableDropdownComp.model.value = modelValue;
         scrollableDropdownFixture.detectChanges();
@@ -204,12 +200,9 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
       });
 
       it('should init component properly', () => {
-        const results$ = authorityServiceStub.getEntriesByName({} as  any);
         expect(scrollableDropdownComp.optionsList).toBeDefined();
-        results$.subscribe((results) => {
-          expect(scrollableDropdownComp.optionsList).toEqual(results.payload);
-          expect(scrollableDropdownComp.model.value).toEqual(modelValue);
-        })
+        expect(scrollableDropdownComp.optionsList).toEqual(vocabularyServiceStub.getList());
+        expect(scrollableDropdownComp.model.value).toEqual(modelValue);
       });
     });
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 5eda1372ebc..61c2d634aec 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -2,28 +2,32 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } fro
 import { FormGroup } from '@angular/forms';
 
 import { Observable, of as observableOf } from 'rxjs';
-import { catchError, distinctUntilChanged, first, tap } from 'rxjs/operators';
+import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
-import {
-  DynamicFormControlComponent,
-  DynamicFormLayoutService,
-  DynamicFormValidationService
-} from '@ng-dynamic-forms/core';
+import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { isNull, isUndefined } from '../../../../../empty.util';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { IntegrationSearchOptions } from '../../../../../../core/integration/models/integration-options.model';
-import { IntegrationData } from '../../../../../../core/integration/integration-data';
-
+import { isEmpty } from '../../../../../empty.util';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import {
+  PaginatedList,
+  buildPaginatedList
+} from '../../../../../../core/data/paginated-list.model';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+
+/**
+ * Component representing a dropdown input field
+ */
 @Component({
   selector: 'ds-dynamic-scrollable-dropdown',
   styleUrls: ['./dynamic-scrollable-dropdown.component.scss'],
   templateUrl: './dynamic-scrollable-dropdown.component.html'
 })
-export class DsDynamicScrollableDropdownComponent extends DynamicFormControlComponent implements OnInit {
+export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit {
   @Input() bindId = true;
   @Input() group: FormGroup;
   @Input() model: DynamicScrollableDropdownModel;
@@ -37,39 +41,38 @@ export class DsDynamicScrollableDropdownComponent extends DynamicFormControlComp
   public pageInfo: PageInfo;
   public optionsList: any;
 
-  protected searchOptions: IntegrationSearchOptions;
-
-  constructor(private authorityService: AuthorityService,
-              private cdr: ChangeDetectorRef,
+  constructor(protected vocabularyService: VocabularyService,
+              protected cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService
   ) {
-    super(layoutService, validationService);
+    super(vocabularyService, layoutService, validationService);
   }
 
+  /**
+   * Initialize the component, setting up the init form value
+   */
   ngOnInit() {
-    this.searchOptions = new IntegrationSearchOptions(
-      this.model.authorityOptions.scope,
-      this.model.authorityOptions.name,
-      this.model.authorityOptions.metadata,
-      '',
-      this.model.maxOptions,
-      1);
-    this.authorityService.getEntriesByName(this.searchOptions).pipe(
-      catchError(() => {
-        const emptyResult = new IntegrationData(
-          new PageInfo(),
-          []
-        );
-        return observableOf(emptyResult);
-      }),
-      first())
-      .subscribe((object: IntegrationData) => {
-        this.optionsList = object.payload;
+    this.updatePageInfo(this.model.maxOptions, 1)
+    this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      catchError(() => observableOf(buildPaginatedList(
+        new PageInfo(),
+        []
+        ))
+      ))
+      .subscribe((list: PaginatedList<VocabularyEntry>) => {
+        this.optionsList = list.page;
         if (this.model.value) {
-          this.setCurrentValue(this.model.value);
+          this.setCurrentValue(this.model.value, true);
         }
-        this.pageInfo = object.pageInfo;
+
+        this.updatePageInfo(
+          list.pageInfo.elementsPerPage,
+          list.pageInfo.currentPage,
+          list.pageInfo.totalElements,
+          list.pageInfo.totalPages
+        );
         this.cdr.detectChanges();
       });
 
@@ -77,75 +80,90 @@ export class DsDynamicScrollableDropdownComponent extends DynamicFormControlComp
       .subscribe((value) => {
         this.setCurrentValue(value);
       });
-
   }
 
-  inputFormatter = (x: AuthorityValue): string => x.display || x.value;
+  /**
+   * Converts an item from the result list to a `string` to display in the `<input>` field.
+   */
+  inputFormatter = (x: VocabularyEntry): string => x.display || x.value;
 
+  /**
+   * Opens dropdown menu
+   * @param sdRef The reference of the NgbDropdown.
+   */
   openDropdown(sdRef: NgbDropdown) {
     if (!this.model.readOnly) {
+      this.group.markAsUntouched();
       sdRef.open();
     }
   }
 
+  /**
+   * Loads any new entries
+   */
   onScroll() {
     if (!this.loading && this.pageInfo.currentPage <= this.pageInfo.totalPages) {
       this.loading = true;
-      this.searchOptions.currentPage++;
-      this.authorityService.getEntriesByName(this.searchOptions).pipe(
-        catchError(() => {
-          const emptyResult = new IntegrationData(
-            new PageInfo(),
-            []
-          );
-          return observableOf(emptyResult);
-        }),
+      this.updatePageInfo(
+        this.pageInfo.elementsPerPage,
+        this.pageInfo.currentPage + 1,
+        this.pageInfo.totalElements,
+        this.pageInfo.totalPages
+      );
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        catchError(() => observableOf(buildPaginatedList(
+          new PageInfo(),
+          []
+          ))
+        ),
         tap(() => this.loading = false))
-        .subscribe((object: IntegrationData) => {
-          this.optionsList = this.optionsList.concat(object.payload);
-          this.pageInfo = object.pageInfo;
+        .subscribe((list: PaginatedList<VocabularyEntry>) => {
+          this.optionsList = this.optionsList.concat(list.page);
+          this.updatePageInfo(
+            list.pageInfo.elementsPerPage,
+            list.pageInfo.currentPage,
+            list.pageInfo.totalElements,
+            list.pageInfo.totalPages
+          );
           this.cdr.detectChanges();
         })
     }
   }
 
-  onBlur(event: Event) {
-    this.blur.emit(event);
-  }
-
-  onFocus(event) {
-    this.focus.emit(event);
-  }
-
+  /**
+   * Emits a change event and set the current value with the given value.
+   * @param event The value to emit.
+   */
   onSelect(event) {
     this.group.markAsDirty();
-    this.model.valueUpdates.next(event);
-    this.change.emit(event);
+    this.dispatchUpdate(event);
     this.setCurrentValue(event);
   }
 
-  onToggle(sdRef: NgbDropdown) {
-    if (sdRef.isOpen()) {
-      this.focus.emit(event);
-    } else {
-      this.blur.emit(event);
-    }
-  }
-
-  setCurrentValue(value): void {
-    let result: string;
-    if (isUndefined(value) || isNull(value)) {
-      result = '';
-    } else if (typeof value === 'string') {
-      result = value;
+  /**
+   * Sets the current value with the given value.
+   * @param value The value to set.
+   * @param init Representing if is init value or not.
+   */
+  setCurrentValue(value: any, init = false): void {
+    let result: Observable<string>;
+
+    if (init) {
+      result = this.getInitValueFromModel().pipe(
+        map((formValue: FormFieldMetadataValueObject) => formValue.display)
+      );
     } else {
-      for (const item of this.optionsList) {
-        if (value.value === (item as any).value) {
-          result = this.inputFormatter(item);
-          break;
-        }
+      if (isEmpty(value)) {
+        result = observableOf('');
+      } else if (typeof value === 'string') {
+        result = observableOf(value);
+      } else {
+        result = observableOf(value.display)
       }
     }
-    this.currentValue = observableOf(result);
+
+    this.currentValue = result;
   }
+
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index 8ab497ec6e6..a9974717e4c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -1,11 +1,11 @@
 import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
 export interface DynamicScrollableDropdownModelConfig extends DsDynamicInputModelConfig {
-  authorityOptions: AuthorityOptions;
+  vocabularyOptions: VocabularyOptions;
   maxOptions?: number;
   value?: any;
 }
@@ -20,7 +20,7 @@ export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
     super(config, layout);
 
     this.autoComplete = AUTOCOMPLETE_OFF;
-    this.authorityOptions = config.authorityOptions;
+    this.vocabularyOptions = config.vocabularyOptions;
     this.maxOptions = config.maxOptions || 10;
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
index 79d652623ff..d40ea72764f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
@@ -12,15 +12,14 @@ import {
 import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { NgbModule, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
 
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { AuthorityServiceStub } from '../../../../../testing/authority-service.stub';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { DsDynamicTagComponent } from './dynamic-tag.component';
 import { DynamicTagModel } from './dynamic-tag.model';
-import { GlobalConfig } from '../../../../../../../config/global-config.interface';
 import { Chips } from '../../../../../chips/models/chips.model';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { createTestComponent } from '../../../../../testing/utils.test';
 
 function createKeyUpEvent(key: number) {
@@ -45,12 +44,10 @@ function init() {
   });
 
   TAG_TEST_MODEL_CONFIG = {
-    authorityOptions: {
+    vocabularyOptions: {
       closed: false,
-      metadata: 'tag',
-      name: 'common_iso_languages',
-      scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-    } as AuthorityOptions,
+      name: 'common_iso_languages'
+    } as VocabularyOptions,
     disabled: false,
     id: 'tag',
     label: 'Keywords',
@@ -75,7 +72,7 @@ describe('DsDynamicTagComponent test suite', () => {
 
   // async beforeEach
   beforeEach(async(() => {
-    const authorityServiceStub = new AuthorityServiceStub();
+    const vocabularyServiceStub = new VocabularyServiceStub();
     init();
     TestBed.configureTestingModule({
       imports: [
@@ -92,7 +89,7 @@ describe('DsDynamicTagComponent test suite', () => {
       providers: [
         ChangeDetectorRef,
         DsDynamicTagComponent,
-        { provide: AuthorityService, useValue: authorityServiceStub },
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: {} },
         { provide: DynamicFormValidationService, useValue: {} }
       ],
@@ -124,7 +121,7 @@ describe('DsDynamicTagComponent test suite', () => {
     }));
   });
 
-  describe('when authorityOptions are set', () => {
+  describe('when vocabularyOptions are set', () => {
     describe('and init model value is empty', () => {
       beforeEach(() => {
 
@@ -143,25 +140,23 @@ describe('DsDynamicTagComponent test suite', () => {
       it('should init component properly', () => {
         chips = new Chips([], 'display');
         expect(tagComp.chips.getChipsItems()).toEqual(chips.getChipsItems());
-
-        expect(tagComp.searchOptions).toBeDefined();
       });
 
       it('should search when 3+ characters typed', fakeAsync(() => {
-        spyOn((tagComp as any).authorityService, 'getEntriesByName').and.callThrough();
+        spyOn((tagComp as any).vocabularyService, 'getVocabularyEntriesByValue').and.callThrough();
 
         tagComp.search(observableOf('test')).subscribe(() => {
-          expect((tagComp as any).authorityService.getEntriesByName).toHaveBeenCalled();
+          expect((tagComp as any).vocabularyService.getVocabularyEntriesByValue).toHaveBeenCalled();
         });
       }));
 
       it('should select a results entry properly', fakeAsync(() => {
         modelValue = [
-          Object.assign(new AuthorityValue(), { id: 1, display: 'Name, Lastname', value: 1 })
+          Object.assign(new VocabularyEntry(), { authority: 1, display: 'Name, Lastname', value: 1 })
         ];
         const event: NgbTypeaheadSelectItemEvent = {
-          item: Object.assign(new AuthorityValue(), {
-            id: 1,
+          item: Object.assign(new VocabularyEntry(), {
+            authority: 1,
             display: 'Name, Lastname',
             value: 1
           }),
@@ -233,13 +228,12 @@ describe('DsDynamicTagComponent test suite', () => {
       it('should init component properly', () => {
         chips = new Chips(modelValue, 'display');
         expect(tagComp.chips.getChipsItems()).toEqual(chips.getChipsItems());
-        expect(tagComp.searchOptions).toBeDefined();
       });
     });
 
   });
 
-  describe('when authorityOptions are not set', () => {
+  describe('when vocabularyOptions are not set', () => {
     describe('and init model value is empty', () => {
       beforeEach(() => {
 
@@ -247,7 +241,7 @@ describe('DsDynamicTagComponent test suite', () => {
         tagComp = tagFixture.componentInstance; // FormComponent test instance
         tagComp.group = TAG_TEST_GROUP;
         const config = TAG_TEST_MODEL_CONFIG;
-        config.authorityOptions = null;
+        config.vocabularyOptions = null;
         tagComp.model = new DynamicTagModel(config);
         tagFixture.detectChanges();
       });
@@ -260,7 +254,6 @@ describe('DsDynamicTagComponent test suite', () => {
       it('should init component properly', () => {
         chips = new Chips([], 'display');
         expect(tagComp.chips.getChipsItems()).toEqual(chips.getChipsItems());
-        expect(tagComp.searchOptions).not.toBeDefined();
       });
 
       it('should add an item on ENTER or key press is \',\' or \';\'', fakeAsync(() => {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index 69a7a5a8c2f..90b8dc0044f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -1,29 +1,36 @@
-import { ChangeDetectorRef, Component, EventEmitter, Inject, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
-import {
-  DynamicFormControlComponent,
-  DynamicFormLayoutService,
-  DynamicFormValidationService
-} from '@ng-dynamic-forms/core';
-import { of as observableOf,  Observable } from 'rxjs';
-import { catchError, debounceTime, distinctUntilChanged, tap, switchMap, map, merge } from 'rxjs/operators';
+import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { Observable, of as observableOf } from 'rxjs';
+import { catchError, debounceTime, distinctUntilChanged, map, merge, switchMap, tap } from 'rxjs/operators';
 import { NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
 import { isEqual } from 'lodash';
 
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { DynamicTagModel } from './dynamic-tag.model';
-import { IntegrationSearchOptions } from '../../../../../../core/integration/models/integration-options.model';
 import { Chips } from '../../../../../chips/models/chips.model';
 import { hasValue, isNotEmpty } from '../../../../../empty.util';
 import { environment } from '../../../../../../../environments/environment';
-
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import {
+  PaginatedList,
+  buildPaginatedList
+} from '../../../../../../core/data/paginated-list.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+
+/**
+ * Component representing a tag input field
+ */
 @Component({
   selector: 'ds-dynamic-tag',
   styleUrls: ['./dynamic-tag.component.scss'],
   templateUrl: './dynamic-tag.component.html'
 })
-export class DsDynamicTagComponent extends DynamicFormControlComponent implements OnInit {
+export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implements OnInit {
+
   @Input() bindId = true;
   @Input() group: FormGroup;
   @Input() model: DynamicTagModel;
@@ -32,19 +39,34 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
   @Output() change: EventEmitter<any> = new EventEmitter<any>();
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
-  @ViewChild('instance', {static: false}) instance: NgbTypeahead;
+  @ViewChild('instance', { static: false }) instance: NgbTypeahead;
 
   chips: Chips;
   hasAuthority: boolean;
 
   searching = false;
-  searchOptions: IntegrationSearchOptions;
   searchFailed = false;
   hideSearchingWhenUnsubscribed = new Observable(() => () => this.changeSearchingStatus(false));
   currentValue: any;
+  public pageInfo: PageInfo;
 
+  constructor(protected vocabularyService: VocabularyService,
+              private cdr: ChangeDetectorRef,
+              protected layoutService: DynamicFormLayoutService,
+              protected validationService: DynamicFormValidationService
+  ) {
+    super(vocabularyService, layoutService, validationService);
+  }
+
+  /**
+   * Converts an item from the result list to a `string` to display in the `<input>` field.
+   */
   formatter = (x: { display: string }) => x.display;
 
+  /**
+   * Converts a stream of text values from the `<input>` element to the stream of the array of items
+   * to display in the typeahead popup.
+   */
   search = (text$: Observable<string>) =>
     text$.pipe(
       debounceTime(300),
@@ -52,45 +74,29 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
       tap(() => this.changeSearchingStatus(true)),
       switchMap((term) => {
         if (term === '' || term.length < this.model.minChars) {
-          return observableOf({list: []});
+          return observableOf({ list: [] });
         } else {
-          this.searchOptions.query = term;
-          return this.authorityService.getEntriesByName(this.searchOptions).pipe(
-            map((authorities) => {
-              // @TODO Pagination for authority is not working, to refactor when it will be fixed
-              return {
-                list: authorities.payload,
-                pageInfo: authorities.pageInfo
-              };
-            }),
+          return this.vocabularyService.getVocabularyEntriesByValue(term, false, this.model.vocabularyOptions, new PageInfo()).pipe(
+            getFirstSucceededRemoteDataPayload(),
             tap(() => this.searchFailed = false),
             catchError(() => {
               this.searchFailed = true;
-              return observableOf({list: []});
+              return observableOf(buildPaginatedList(
+                new PageInfo(),
+                []
+              ));
             }));
         }
       }),
-      map((results) => results.list),
+      map((list: PaginatedList<VocabularyEntry>) => list.page),
       tap(() => this.changeSearchingStatus(false)),
       merge(this.hideSearchingWhenUnsubscribed));
 
-  constructor(private authorityService: AuthorityService,
-              private cdr: ChangeDetectorRef,
-              protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
-  ) {
-    super(layoutService, validationService);
-  }
-
+  /**
+   * Initialize the component, setting up the init form value
+   */
   ngOnInit() {
-    this.hasAuthority = this.model.authorityOptions && hasValue(this.model.authorityOptions.name);
-
-    if (this.hasAuthority) {
-      this.searchOptions = new IntegrationSearchOptions(
-        this.model.authorityOptions.scope,
-        this.model.authorityOptions.name,
-        this.model.authorityOptions.metadata);
-    }
+    this.hasAuthority = this.model.vocabularyOptions && hasValue(this.model.vocabularyOptions.name);
 
     this.chips = new Chips(
       this.model.value,
@@ -103,17 +109,24 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
         const items = this.chips.getChipsItems();
         // Does not emit change if model value is equal to the current value
         if (!isEqual(items, this.model.value)) {
-          this.model.valueUpdates.next(items);
-          this.change.emit(event);
+          this.dispatchUpdate(items);
         }
       });
   }
 
+  /**
+   * Changes the searching status
+   * @param status
+   */
   changeSearchingStatus(status: boolean) {
     this.searching = status;
     this.cdr.detectChanges();
   }
 
+  /**
+   * Mark form group as dirty on input
+   * @param event
+   */
   onInput(event) {
     if (event.data) {
       this.group.markAsDirty();
@@ -121,6 +134,10 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
     this.cdr.detectChanges();
   }
 
+  /**
+   * Emits a blur event containing a given value and add all tags to chips.
+   * @param event The value to emit.
+   */
   onBlur(event: Event) {
     if (isNotEmpty(this.currentValue) && !this.instance.isPopupOpen()) {
       this.addTagsToChips();
@@ -128,10 +145,10 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
     this.blur.emit(event);
   }
 
-  onFocus(event) {
-    this.focus.emit(event);
-  }
-
+  /**
+   * Updates model value with the selected value and add a new tag to chips.
+   * @param event The value to set.
+   */
   onSelectItem(event: NgbTypeaheadSelectItemEvent) {
     this.chips.add(event.item);
     // this.group.controls[this.model.id].setValue(this.model.value);
@@ -139,25 +156,34 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
 
     setTimeout(() => {
       // Reset the input text after x ms, mandatory or the formatter overwrite it
-      this.currentValue = null;
+      this.setCurrentValue(null);
       this.cdr.detectChanges();
     }, 50);
   }
 
   updateModel(event) {
-    this.model.valueUpdates.next(this.chips.getChipsItems());
-    this.change.emit(event);
+    /*    this.model.valueUpdates.next(this.chips.getChipsItems());
+        this.change.emit(event);*/
+    this.dispatchUpdate(this.chips.getChipsItems());
   }
 
+  /**
+   * Add a new tag with typed text when typing 'Enter' or ',' or ';'
+   * @param event the keyUp event
+   */
   onKeyUp(event) {
     if (event.keyCode === 13 || event.keyCode === 188) {
       event.preventDefault();
-      // Key: Enter or ',' or ';'
+      // Key: 'Enter' or ',' or ';'
       this.addTagsToChips();
       event.stopPropagation();
     }
   }
 
+  /**
+   * Prevent propagation of a key event in case of return key is pressed
+   * @param event the key event
+   */
   preventEventsPropagation(event) {
     event.stopPropagation();
     if (event.keyCode === 13) {
@@ -165,8 +191,17 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
     }
   }
 
+  /**
+   * Sets the current value with the given value.
+   * @param value The value to set.
+   * @param init Representing if is init value or not.
+   */
+  public setCurrentValue(value: any, init = false) {
+    this.currentValue = value;
+  }
+
   private addTagsToChips() {
-    if (hasValue(this.currentValue) && (!this.hasAuthority || !this.model.authorityOptions.closed)) {
+    if (hasValue(this.currentValue) && (!this.hasAuthority || !this.model.vocabularyOptions.closed)) {
       let res: string[] = [];
       res = this.currentValue.split(',');
 
@@ -187,7 +222,7 @@ export class DsDynamicTagComponent extends DynamicFormControlComponent implement
       // this.currentValue = '';
       setTimeout(() => {
         // Reset the input text after x ms, mandatory or the formatter overwrite it
-        this.currentValue = null;
+        this.setCurrentValue(null);
         this.cdr.detectChanges();
       }, 50);
       this.updateModel(event);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.spec.ts
deleted file mode 100644
index f31f0eeff9c..00000000000
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.spec.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-// Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { async, ComponentFixture, fakeAsync, inject, TestBed, tick, } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { AuthorityOptions } from '../../../../../../core/integration/models/authority-options.model';
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { AuthorityServiceStub } from '../../../../../testing/authority-service.stub';
-import { GlobalConfig } from '../../../../../../../config/global-config.interface';
-import { DsDynamicTypeaheadComponent } from './dynamic-typeahead.component';
-import { DynamicTypeaheadModel } from './dynamic-typeahead.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
-import { AuthorityConfidenceStateDirective } from '../../../../../authority-confidence/authority-confidence-state.directive';
-import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
-
-export let TYPEAHEAD_TEST_GROUP;
-
-export let TYPEAHEAD_TEST_MODEL_CONFIG;
-
-function init() {
-  TYPEAHEAD_TEST_GROUP = new FormGroup({
-    typeahead: new FormControl(),
-  });
-
-  TYPEAHEAD_TEST_MODEL_CONFIG = {
-    authorityOptions: {
-      closed: false,
-      metadata: 'typeahead',
-      name: 'EVENTAuthority',
-      scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
-    } as AuthorityOptions,
-    disabled: false,
-    id: 'typeahead',
-    label: 'Conference',
-    minChars: 3,
-    name: 'typeahead',
-    placeholder: 'Conference',
-    readOnly: false,
-    required: false,
-    repeatable: false,
-    value: undefined
-  };
-}
-describe('DsDynamicTypeaheadComponent test suite', () => {
-
-  let testComp: TestComponent;
-  let typeaheadComp: DsDynamicTypeaheadComponent;
-  let testFixture: ComponentFixture<TestComponent>;
-  let typeaheadFixture: ComponentFixture<DsDynamicTypeaheadComponent>;
-  let html;
-
-  // async beforeEach
-  beforeEach(async(() => {
-    const authorityServiceStub = new AuthorityServiceStub();
-    init();
-    TestBed.configureTestingModule({
-      imports: [
-        DynamicFormsCoreModule,
-        DynamicFormsNGBootstrapUIModule,
-        FormsModule,
-        NgbModule,
-        ReactiveFormsModule,
-        TranslateModule.forRoot()
-      ],
-      declarations: [
-        DsDynamicTypeaheadComponent,
-        TestComponent,
-        AuthorityConfidenceStateDirective,
-        ObjNgFor
-      ], // declare the test component
-      providers: [
-        ChangeDetectorRef,
-        DsDynamicTypeaheadComponent,
-        { provide: AuthorityService, useValue: authorityServiceStub },
-        { provide: DynamicFormLayoutService, useValue: {} },
-        { provide: DynamicFormValidationService, useValue: {} }
-      ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
-    });
-
-  }));
-
-  describe('', () => {
-    // synchronous beforeEach
-    beforeEach(() => {
-      html = `
-      <ds-dynamic-typeahead [bindId]="bindId"
-                            [group]="group"
-                            [model]="model"
-                            (blur)="onBlur($event)"
-                            (change)="onValueChange($event)"
-                            (focus)="onFocus($event)"></ds-dynamic-typeahead>`;
-
-      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
-      testComp = testFixture.componentInstance;
-    });
-
-    afterEach(() => {
-      testFixture.destroy();
-    });
-    it('should create DsDynamicTypeaheadComponent', inject([DsDynamicTypeaheadComponent], (app: DsDynamicTypeaheadComponent) => {
-
-      expect(app).toBeDefined();
-    }));
-  });
-
-  describe('', () => {
-    describe('when init model value is empty', () => {
-      beforeEach(() => {
-
-        typeaheadFixture = TestBed.createComponent(DsDynamicTypeaheadComponent);
-        typeaheadComp = typeaheadFixture.componentInstance; // FormComponent test instance
-        typeaheadComp.group = TYPEAHEAD_TEST_GROUP;
-        typeaheadComp.model = new DynamicTypeaheadModel(TYPEAHEAD_TEST_MODEL_CONFIG);
-        typeaheadFixture.detectChanges();
-      });
-
-      afterEach(() => {
-        typeaheadFixture.destroy();
-        typeaheadComp = null;
-      });
-
-      it('should init component properly', () => {
-        expect(typeaheadComp.currentValue).not.toBeDefined();
-      });
-
-      it('should search when 3+ characters typed', fakeAsync(() => {
-
-        spyOn((typeaheadComp as any).authorityService, 'getEntriesByName').and.callThrough();
-
-        typeaheadComp.search(observableOf('test')).subscribe();
-
-        tick(300);
-        typeaheadFixture.detectChanges();
-
-        expect((typeaheadComp as any).authorityService.getEntriesByName).toHaveBeenCalled();
-      }));
-
-      it('should set model.value on input type when AuthorityOptions.closed is false', () => {
-        const inputDe = typeaheadFixture.debugElement.query(By.css('input.form-control'));
-        const inputElement = inputDe.nativeElement;
-
-        inputElement.value = 'test value';
-        inputElement.dispatchEvent(new Event('input'));
-
-        expect(typeaheadComp.inputValue).toEqual(new FormFieldMetadataValueObject('test value'))
-
-      });
-
-      it('should not set model.value on input type when AuthorityOptions.closed is true', () => {
-        typeaheadComp.model.authorityOptions.closed = true;
-        typeaheadFixture.detectChanges();
-        const inputDe = typeaheadFixture.debugElement.query(By.css('input.form-control'));
-        const inputElement = inputDe.nativeElement;
-
-        inputElement.value = 'test value';
-        inputElement.dispatchEvent(new Event('input'));
-
-        expect(typeaheadComp.model.value).not.toBeDefined();
-
-      });
-
-      it('should emit blur Event onBlur when popup is closed', () => {
-        spyOn(typeaheadComp.blur, 'emit');
-        spyOn(typeaheadComp.instance, 'isPopupOpen').and.returnValue(false);
-        typeaheadComp.onBlur(new Event('blur'));
-        expect(typeaheadComp.blur.emit).toHaveBeenCalled();
-      });
-
-      it('should not emit blur Event onBlur when popup is opened', () => {
-        spyOn(typeaheadComp.blur, 'emit');
-        spyOn(typeaheadComp.instance, 'isPopupOpen').and.returnValue(true);
-        const input = typeaheadFixture.debugElement.query(By.css('input'));
-
-        input.nativeElement.blur();
-        expect(typeaheadComp.blur.emit).not.toHaveBeenCalled();
-      });
-
-      it('should emit change Event onBlur when AuthorityOptions.closed is false and inputValue is changed', () => {
-        typeaheadComp.inputValue = 'test value';
-        typeaheadFixture.detectChanges();
-        spyOn(typeaheadComp.blur, 'emit');
-        spyOn(typeaheadComp.change, 'emit');
-        spyOn(typeaheadComp.instance, 'isPopupOpen').and.returnValue(false);
-        typeaheadComp.onBlur(new Event('blur', ));
-        expect(typeaheadComp.change.emit).toHaveBeenCalled();
-        expect(typeaheadComp.blur.emit).toHaveBeenCalled();
-      });
-
-      it('should not emit change Event onBlur when AuthorityOptions.closed is false and inputValue is not changed', () => {
-        typeaheadComp.inputValue = 'test value';
-        typeaheadComp.model = new DynamicTypeaheadModel(TYPEAHEAD_TEST_MODEL_CONFIG);
-        (typeaheadComp.model as any).value = 'test value';
-        typeaheadFixture.detectChanges();
-        spyOn(typeaheadComp.blur, 'emit');
-        spyOn(typeaheadComp.change, 'emit');
-        spyOn(typeaheadComp.instance, 'isPopupOpen').and.returnValue(false);
-        typeaheadComp.onBlur(new Event('blur', ));
-        expect(typeaheadComp.change.emit).not.toHaveBeenCalled();
-        expect(typeaheadComp.blur.emit).toHaveBeenCalled();
-      });
-
-      it('should not emit change Event onBlur when AuthorityOptions.closed is false and inputValue is null', () => {
-        typeaheadComp.inputValue = null;
-        typeaheadComp.model = new DynamicTypeaheadModel(TYPEAHEAD_TEST_MODEL_CONFIG);
-        (typeaheadComp.model as any).value = 'test value';
-        typeaheadFixture.detectChanges();
-        spyOn(typeaheadComp.blur, 'emit');
-        spyOn(typeaheadComp.change, 'emit');
-        spyOn(typeaheadComp.instance, 'isPopupOpen').and.returnValue(false);
-        typeaheadComp.onBlur(new Event('blur', ));
-        expect(typeaheadComp.change.emit).not.toHaveBeenCalled();
-        expect(typeaheadComp.blur.emit).toHaveBeenCalled();
-      });
-
-      it('should emit focus Event onFocus', () => {
-        spyOn(typeaheadComp.focus, 'emit');
-        typeaheadComp.onFocus(new Event('focus'));
-        expect(typeaheadComp.focus.emit).toHaveBeenCalled();
-      });
-
-    });
-
-    describe('and init model value is not empty', () => {
-      beforeEach(() => {
-        typeaheadFixture = TestBed.createComponent(DsDynamicTypeaheadComponent);
-        typeaheadComp = typeaheadFixture.componentInstance; // FormComponent test instance
-        typeaheadComp.group = TYPEAHEAD_TEST_GROUP;
-        typeaheadComp.model = new DynamicTypeaheadModel(TYPEAHEAD_TEST_MODEL_CONFIG);
-        (typeaheadComp.model as any).value = new FormFieldMetadataValueObject('test', null, 'test001');
-        typeaheadFixture.detectChanges();
-      });
-
-      afterEach(() => {
-        typeaheadFixture.destroy();
-        typeaheadComp = null;
-      });
-
-      it('should init component properly', () => {
-        expect(typeaheadComp.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, 'test001'));
-      });
-
-      it('should emit change Event onChange and currentValue is empty', () => {
-        typeaheadComp.currentValue = null;
-        spyOn(typeaheadComp.change, 'emit');
-        typeaheadComp.onChange(new Event('change'));
-        expect(typeaheadComp.change.emit).toHaveBeenCalled();
-        expect(typeaheadComp.model.value).toBeNull();
-      });
-    });
-
-  });
-});
-
-// declare a test component
-@Component({
-  selector: 'ds-test-cmp',
-  template: ``
-})
-class TestComponent {
-
-  group: FormGroup = TYPEAHEAD_TEST_GROUP;
-
-  model = new DynamicTypeaheadModel(TYPEAHEAD_TEST_MODEL_CONFIG);
-
-}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
deleted file mode 100644
index 791704a7ca7..00000000000
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
-import {
-  DynamicFormControlComponent,
-  DynamicFormLayoutService,
-  DynamicFormValidationService
-} from '@ng-dynamic-forms/core';
-import { catchError, debounceTime, distinctUntilChanged, filter, map, merge, switchMap, tap } from 'rxjs/operators';
-import { Observable, of as observableOf, Subject } from 'rxjs';
-import { NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
-
-import { AuthorityService } from '../../../../../../core/integration/authority.service';
-import { DynamicTypeaheadModel } from './dynamic-typeahead.model';
-import { IntegrationSearchOptions } from '../../../../../../core/integration/models/integration-options.model';
-import { isEmpty, isNotEmpty, isNotNull } from '../../../../../empty.util';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { ConfidenceType } from '../../../../../../core/integration/models/confidence-type';
-
-@Component({
-  selector: 'ds-dynamic-typeahead',
-  styleUrls: ['./dynamic-typeahead.component.scss'],
-  templateUrl: './dynamic-typeahead.component.html'
-})
-export class DsDynamicTypeaheadComponent extends DynamicFormControlComponent implements OnInit {
-  @Input() bindId = true;
-  @Input() group: FormGroup;
-  @Input() model: DynamicTypeaheadModel;
-
-  @Output() blur: EventEmitter<any> = new EventEmitter<any>();
-  @Output() change: EventEmitter<any> = new EventEmitter<any>();
-  @Output() focus: EventEmitter<any> = new EventEmitter<any>();
-
-  @ViewChild('instance', {static: false}) instance: NgbTypeahead;
-
-  searching = false;
-  searchOptions: IntegrationSearchOptions;
-  searchFailed = false;
-  hideSearchingWhenUnsubscribed$ = new Observable(() => () => this.changeSearchingStatus(false));
-  click$ = new Subject<string>();
-  currentValue: any;
-  inputValue: any;
-
-  formatter = (x: { display: string }) => {
-    return (typeof x === 'object') ? x.display : x
-  };
-
-  search = (text$: Observable<string>) => {
-    return text$.pipe(
-      merge(this.click$),
-      debounceTime(300),
-      distinctUntilChanged(),
-      tap(() => this.changeSearchingStatus(true)),
-      switchMap((term) => {
-        if (term === '' || term.length < this.model.minChars) {
-          return observableOf({list: []});
-        } else {
-          this.searchOptions.query = term;
-          return this.authorityService.getEntriesByName(this.searchOptions).pipe(
-            map((authorities) => {
-              // @TODO Pagination for authority is not working, to refactor when it will be fixed
-              return {
-                list: authorities.payload,
-                pageInfo: authorities.pageInfo
-              };
-            }),
-            tap(() => this.searchFailed = false),
-            catchError(() => {
-              this.searchFailed = true;
-              return observableOf({list: []});
-            }));
-        }
-      }),
-      map((results) => results.list),
-      tap(() => this.changeSearchingStatus(false)),
-      merge(this.hideSearchingWhenUnsubscribed$)
-    )
-  };
-
-  constructor(private authorityService: AuthorityService,
-              private cdr: ChangeDetectorRef,
-              protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
-  ) {
-    super(layoutService, validationService);
-  }
-
-  ngOnInit() {
-    this.currentValue = this.model.value;
-    this.searchOptions = new IntegrationSearchOptions(
-      this.model.authorityOptions.scope,
-      this.model.authorityOptions.name,
-      this.model.authorityOptions.metadata);
-    this.group.get(this.model.id).valueChanges.pipe(
-      filter((value) => this.currentValue !== value))
-      .subscribe((value) => {
-        this.currentValue = value;
-      });
-  }
-
-  changeSearchingStatus(status: boolean) {
-    this.searching = status;
-    this.cdr.detectChanges();
-  }
-
-  onInput(event) {
-    if (!this.model.authorityOptions.closed && isNotEmpty(event.target.value)) {
-      this.inputValue = new FormFieldMetadataValueObject(event.target.value);
-    }
-  }
-
-  onBlur(event: Event) {
-    if (!this.instance.isPopupOpen()) {
-      if (!this.model.authorityOptions.closed && isNotEmpty(this.inputValue)) {
-        if (isNotNull(this.inputValue) && this.model.value !== this.inputValue) {
-          this.model.valueUpdates.next(this.inputValue);
-          this.change.emit(this.inputValue);
-        }
-        this.inputValue = null;
-      }
-      this.blur.emit(event);
-    } else {
-      // prevent on blur propagation if typeahed suggestions are showed
-      event.preventDefault();
-      event.stopImmediatePropagation();
-      // set focus on input again, this is to avoid to lose changes when no suggestion is selected
-      (event.target as HTMLInputElement).focus();
-    }
-  }
-
-  onChange(event: Event) {
-    event.stopPropagation();
-    if (isEmpty(this.currentValue)) {
-      this.model.valueUpdates.next(null);
-      this.change.emit(null);
-    }
-  }
-
-  onFocus(event) {
-    this.focus.emit(event);
-  }
-
-  onSelectItem(event: NgbTypeaheadSelectItemEvent) {
-    this.inputValue = null;
-    this.currentValue = event.item;
-    this.model.valueUpdates.next(event.item);
-    this.change.emit(event.item);
-  }
-
-  public whenClickOnConfidenceNotAccepted(confidence: ConfidenceType) {
-    if (!this.model.readOnly) {
-      this.click$.next(this.formatter(this.currentValue));
-    }
-  }
-
-}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index b4a9e4c9c79..909dcb19344 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-    <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + label) | translate }}</h4>
+    <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
     <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="modal.dismiss()">
         <span aria-hidden="true">&times;</span>
@@ -7,7 +7,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
 </div>
 <div class="modal-body">
     <ngb-tabset>
-        <ngb-tab [title]="'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + label | translate  : {count: (totalInternal$ | async)}">
+        <ngb-tab [title]="'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : {count: (totalInternal$ | async)}">
             <ng-template ngbTabContent>
                 <ds-dynamic-lookup-relation-search-tab
                         [selection$]="selection$"
@@ -15,6 +15,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
                         [relationship]="relationshipOptions"
                         [repeatable]="repeatable"
                         [context]="context"
+                        [query]="query"
                         (selectObject)="select($event)"
                         (deselectObject)="deselect($event)"
                         class="d-block pt-3">
@@ -43,7 +44,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
                 <ds-dynamic-lookup-relation-selection-tab
                         [selection$]="selection$"
                         [listId]="listId"
-                        [label]="label"
+                        [relationshipType]="relationshipOptions.relationshipType"
                         [repeatable]="repeatable"
                         [context]="context"
                         (selectObject)="select($event)"
@@ -55,7 +56,7 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
     </ngb-tabset>
 </div>
 <div class="modal-footer">
-    <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate:{size: (selection$ | async)?.length || 0}) }}</small>
+    <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
     <div>
         <button type="button" class="btn btn-danger" (click)="close()">{{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index bbad2197a2e..baa6de63664 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -38,6 +38,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   let pSearchOptions;
   let externalSourceService;
   let lookupRelationService;
+  let submissionId;
 
   const externalSources = [
     Object.assign(new ExternalSource(), {
@@ -63,7 +64,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
     listID = '6b0c8221-fcb4-47a8-b483-ca32363fffb3';
     selection$ = observableOf([searchResult1, searchResult2]);
     selectableListService = { getSelectableList: () => selection$ };
-    relationship = { filter: 'filter', relationshipType: 'isAuthorOfPublication', nameVariants: true } as RelationshipOptions;
+    relationship = Object.assign(new RelationshipOptions(), { filter: 'filter', relationshipType: 'isAuthorOfPublication', nameVariants: true, searchConfiguration: 'personConfig' });
     nameVariant = 'Doe, J.';
     metadataField = 'dc.contributor.author';
     pSearchOptions = new PaginatedSearchOptions({});
@@ -74,6 +75,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       getTotalLocalResults: observableOf(totalLocal),
       getTotalExternalResults: observableOf(totalExternal)
     });
+    submissionId = '1234';
   }
 
   beforeEach(async(() => {
@@ -117,6 +119,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
     component.relationshipOptions = relationship;
     component.item = item;
     component.metadataFields = metadataField;
+    component.submissionId = submissionId;
     fixture.detectChanges();
   });
 
@@ -142,8 +145,8 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
     it('should dispatch an AddRelationshipAction for each selected object', () => {
       component.select(searchResult1, searchResult2);
-      const action = new AddRelationshipAction(component.item, searchResult1.indexableObject, relationship.relationshipType, nameVariant);
-      const action2 = new AddRelationshipAction(component.item, searchResult2.indexableObject, relationship.relationshipType, nameVariant);
+      const action = new AddRelationshipAction(component.item, searchResult1.indexableObject, relationship.relationshipType, submissionId, nameVariant);
+      const action2 = new AddRelationshipAction(component.item, searchResult2.indexableObject, relationship.relationshipType, submissionId, nameVariant);
 
       expect((component as any).store.dispatch).toHaveBeenCalledWith(action);
       expect((component as any).store.dispatch).toHaveBeenCalledWith(action2);
@@ -159,8 +162,8 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
     it('should dispatch an RemoveRelationshipAction for each deselected object', () => {
       component.deselect(searchResult1, searchResult2);
-      const action = new RemoveRelationshipAction(component.item, searchResult1.indexableObject, relationship.relationshipType);
-      const action2 = new RemoveRelationshipAction(component.item, searchResult2.indexableObject, relationship.relationshipType);
+      const action = new RemoveRelationshipAction(component.item, searchResult1.indexableObject, relationship.relationshipType, submissionId);
+      const action2 = new RemoveRelationshipAction(component.item, searchResult2.indexableObject, relationship.relationshipType, submissionId);
 
       expect((component as any).store.dispatch).toHaveBeenCalledWith(action);
       expect((component as any).store.dispatch).toHaveBeenCalledWith(action2);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index edf54bf08bf..4ec68c5a1fc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -1,5 +1,5 @@
-import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
-import { combineLatest, Observable, Subscription, zip as observableZip } from 'rxjs';
+import { Component, EventEmitter, NgZone, OnDestroy, OnInit, Output } from '@angular/core';
+import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { hasValue } from '../../../../empty.util';
 import { map, skip, switchMap, take } from 'rxjs/operators';
@@ -11,24 +11,19 @@ import { ListableObject } from '../../../../object-collection/shared/listable-ob
 import { RelationshipOptions } from '../../models/relationship-options.model';
 import { SearchResult } from '../../../../search/search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
-import {
-  getAllSucceededRemoteData,
-  getRemoteDataPayload,
-  getSucceededRemoteData
-} from '../../../../../core/shared/operators';
-import { AddRelationshipAction, RemoveRelationshipAction, UpdateRelationshipAction } from './relationship.actions';
+import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
+import { AddRelationshipAction, RemoveRelationshipAction, UpdateRelationshipNameVariantAction } from './relationship.actions';
 import { RelationshipService } from '../../../../../core/data/relationship.service';
 import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../app.reducer';
 import { Context } from '../../../../../core/shared/context.model';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { ExternalSourceService } from '../../../../../core/data/external-source.service';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -46,6 +41,8 @@ import { ExternalSourceService } from '../../../../../core/data/external-source.
  * Represents a modal where the submitter can select items to be added as a certain relationship type to the object being submitted
  */
 export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy {
+  @Output() selectEvent: EventEmitter<ListableObject[]> = new EventEmitter<ListableObject[]>();
+
   /**
    * The label to use to display i18n messages (describing the type of relationship)
    */
@@ -91,12 +88,15 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
    */
   metadataFields: string;
 
+  query: string;
+
   /**
    * A map of subscriptions within this component
    */
   subMap: {
     [uuid: string]: Subscription
   } = {};
+  submissionId: string;
 
   /**
    * A list of the available external sources configured for this relationship
@@ -122,8 +122,10 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     private lookupRelationService: LookupRelationService,
     private searchConfigService: SearchConfigurationService,
     private zone: NgZone,
-    private store: Store<AppState>
+    private store: Store<AppState>,
+    private router: Router,
   ) {
+
   }
 
   ngOnInit(): void {
@@ -133,8 +135,10 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     this.selection$.pipe(take(1)).subscribe((selection) =>
       selection.map((s: SearchResult<Item>) => this.addNameVariantSubscription(s))
     );
-    if (this.relationshipOptions.nameVariants) {
-      this.context = Context.SubmissionModal;
+    if (this.relationshipOptions.nameVariants === 'true') {
+      this.context = Context.EntitySearchModalWithNameVariants;
+    } else {
+      this.context = Context.EntitySearchModal;
     }
 
     this.externalSourcesRD$ = this.externalSourceService.findAll();
@@ -153,7 +157,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   select(...selectableObjects: Array<SearchResult<Item>>) {
     this.zone.runOutsideAngular(
       () => {
-        const obs: Observable<any[]> = combineLatest(...selectableObjects.map((sri: SearchResult<Item>) => {
+        const obs: Observable<any[]> = observableCombineLatest(...selectableObjects.map((sri: SearchResult<Item>) => {
             this.addNameVariantSubscription(sri);
             return this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid)
               .pipe(
@@ -170,7 +174,8 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
         obs
           .subscribe((arr: any[]) => {
             return arr.forEach((object: any) => {
-                this.store.dispatch(new AddRelationshipAction(this.item, object.item, this.relationshipOptions.relationshipType, object.nameVariant));
+              const addRelationshipAction = new AddRelationshipAction(this.item, object.item, this.relationshipOptions.relationshipType, this.submissionId, object.nameVariant);
+              this.store.dispatch(addRelationshipAction);
               }
             );
           })
@@ -185,7 +190,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     const nameVariant$ = this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid);
     this.subMap[sri.indexableObject.uuid] = nameVariant$.pipe(
       skip(1),
-    ).subscribe((nameVariant: string) => this.store.dispatch(new UpdateRelationshipAction(this.item, sri.indexableObject, this.relationshipOptions.relationshipType, nameVariant)))
+    ).subscribe((nameVariant: string) => this.store.dispatch(new UpdateRelationshipNameVariantAction(this.item, sri.indexableObject, this.relationshipOptions.relationshipType, this.submissionId, nameVariant)))
   }
 
   /**
@@ -196,46 +201,9 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     this.zone.runOutsideAngular(
       () => selectableObjects.forEach((object) => {
         this.subMap[object.indexableObject.uuid].unsubscribe();
-        this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType));
-      })
-    );
-  }
-
-  /**
-   * Set existing name variants for items by the item's virtual metadata
-   */
-  private setExistingNameVariants() {
-    const virtualMDs: MetadataValue[] = this.item.allMetadata(this.metadataFields).filter((mdValue) => mdValue.isVirtual);
-
-    const relatedItemPairs$: Observable<Array<[Item, Item]>> =
-      combineLatest(virtualMDs.map((md: MetadataValue) => this.relationshipService.findById(md.virtualValue).pipe(getSucceededRemoteData(), getRemoteDataPayload())))
-        .pipe(
-          switchMap((relationships: Relationship[]) => combineLatest(relationships.map((relationship: Relationship) =>
-              combineLatest(
-                relationship.leftItem.pipe(getSucceededRemoteData(), getRemoteDataPayload()),
-                relationship.rightItem.pipe(getSucceededRemoteData(), getRemoteDataPayload())
-              ))
-            )
-          )
-        );
-
-    const relatedItems$: Observable<Item[]> = relatedItemPairs$.pipe(
-      map((relatedItemPairs: Array<[Item, Item]>) => {
-        return relatedItemPairs
-          .map(([left, right]: [Item, Item]) => left.uuid === this.item.uuid ? left : right)
+        this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType, this.submissionId));
       })
     );
-
-    relatedItems$.pipe(take(1)).subscribe((relatedItems) => {
-        let index = 0;
-        virtualMDs.forEach(
-          (md: MetadataValue) => {
-            this.relationshipService.setNameVariant(this.listId, relatedItems[index].uuid, md.value);
-            index++;
-          }
-        );
-      }
-    )
   }
 
   /**
@@ -255,7 +223,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
       switchMap((options) => this.lookupRelationService.getTotalLocalResults(this.relationshipOptions, options))
     );
 
-    const externalSourcesAndOptions$ = combineLatest(
+    const externalSourcesAndOptions$ = observableCombineLatest(
       this.externalSourcesRD$.pipe(
         getAllSucceededRemoteData(),
         getRemoteDataPayload()
@@ -265,11 +233,12 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
 
     this.totalExternal$ = externalSourcesAndOptions$.pipe(
       switchMap(([sources, options]) =>
-        observableZip(...sources.page.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))))
+        observableCombineLatest(...sources.page.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))))
     );
   }
 
   ngOnDestroy() {
+    this.router.navigate([], {});
     Object.values(this.subMap).forEach((subscription) => subscription.unsubscribe());
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index 04737c44e47..ba83b7b98b8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -20,9 +20,9 @@ <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' +
         </ds-viewable-collection>
         <ds-loading *ngIf="!entriesRD || !entriesRD?.payload || entriesRD?.isLoading"
                     message="{{'loading.search-results' | translate}}"></ds-loading>
-        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.error || entriesRD?.error?.statusCode != 400)"
+        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode != 400)"
                     message="{{'error.search-results' | translate}}"></ds-error>
-        <div *ngIf="entriesRD?.payload?.page?.length == 0 || entriesRD?.error?.statusCode == 400" id="empty-external-entry-list">
+        <div *ngIf="entriesRD?.payload?.page?.length == 0 || entriesRD?.statusCode == 400" id="empty-external-entry-list">
           {{ 'search.results.empty' | translate }}
         </div>
       </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
index 7e18a1cf966..8ebd214e635 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
@@ -130,7 +130,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
 
   describe('when the external entries are loading', () => {
     beforeEach(() => {
-      component.entriesRD$ = createPendingRemoteDataObject$(undefined);
+      component.entriesRD$ = createPendingRemoteDataObject$();
       fixture.detectChanges();
     });
 
@@ -147,7 +147,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
 
   describe('when the external entries failed loading', () => {
     beforeEach(() => {
-      component.entriesRD$ = createFailedRemoteDataObject$(undefined);
+      component.entriesRD$ = createFailedRemoteDataObject$('server error', 500);
       fixture.detectChanges();
     });
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index a280f577f1b..2911369fcc6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
 import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
 import { ExternalSource } from '../../../../../../core/shared/external-source.model';
 import { startWith, switchMap } from 'rxjs/operators';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index 7e0fe787177..e060dcffa17 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -5,7 +5,7 @@ import { MetadataValue } from '../../../../../../../core/shared/metadata.models'
 import { Metadata } from '../../../../../../../core/shared/metadata.utils';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
 import { SearchResult } from '../../../../../../search/search-result.model';
 import { Item } from '../../../../../../../core/shared/item.model';
 import { RelationshipOptions } from '../../../../models/relationship-options.model';
@@ -18,7 +18,7 @@ import { ListableObject } from '../../../../../../object-collection/shared/lista
 import { Collection } from '../../../../../../../core/shared/collection.model';
 import { ItemDataService } from '../../../../../../../core/data/item-data.service';
 import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../../../../core/shared/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../../../../../core/shared/operators';
 import { take } from 'rxjs/operators';
 import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
@@ -105,7 +105,7 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
   /**
    * The context we're currently in (submission)
    */
-  context = Context.SubmissionModal;
+  context = Context.EntitySearchModalWithNameVariants;
 
   /**
    * List ID for selecting local entities
@@ -212,7 +212,7 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
    */
   importNewEntity() {
     this.itemService.importExternalSourceEntry(this.externalSourceEntry, this.collectionId).pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       take(1)
     ).subscribe((item: Item) => {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
index 57375bd3802..6b494958c58 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
@@ -4,10 +4,12 @@
 import { type } from '../../../../ngrx/type';
 import { Action } from '@ngrx/store';
 import { Item } from '../../../../../core/shared/item.model';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 
 export const RelationshipActionTypes = {
   ADD_RELATIONSHIP: type('dspace/relationship/ADD_RELATIONSHIP'),
   REMOVE_RELATIONSHIP: type('dspace/relationship/REMOVE_RELATIONSHIP'),
+  UPDATE_NAME_VARIANT: type('dspace/relationship/UPDATE_NAME_VARIANT'),
   UPDATE_RELATIONSHIP: type('dspace/relationship/UPDATE_RELATIONSHIP'),
 };
 
@@ -22,6 +24,7 @@ export class AddRelationshipAction implements Action {
     item1: Item;
     item2: Item;
     relationshipType: string;
+    submissionId: string;
     nameVariant: string;
   };
 
@@ -31,43 +34,70 @@ export class AddRelationshipAction implements Action {
    * @param item1 The first item in the relationship
    * @param item2 The second item in the relationship
    * @param relationshipType The label of the relationshipType
+   * @param submissionId The current submissionId
    * @param nameVariant The nameVariant of the relationshipType
    */
   constructor(
     item1: Item,
     item2: Item,
     relationshipType: string,
+    submissionId: string,
     nameVariant?: string
   ) {
-    this.payload = { item1, item2, relationshipType, nameVariant };
+    this.payload = { item1, item2, relationshipType, submissionId, nameVariant };
   }
 }
 
-export class UpdateRelationshipAction implements Action {
-  type = RelationshipActionTypes.UPDATE_RELATIONSHIP;
+export class UpdateRelationshipNameVariantAction implements Action {
+  type = RelationshipActionTypes.UPDATE_NAME_VARIANT;
 
   payload: {
     item1: Item;
     item2: Item;
     relationshipType: string;
+    submissionId: string;
     nameVariant: string;
   };
 
   /**
-   * Create a new UpdateRelationshipAction
+   * Create a new UpdateRelationshipNameVariantAction
    *
    * @param item1 The first item in the relationship
    * @param item2 The second item in the relationship
    * @param relationshipType The label of the relationshipType
+   * @param submissionId The current submissionId
    * @param nameVariant The nameVariant of the relationshipType
    */
   constructor(
     item1: Item,
     item2: Item,
     relationshipType: string,
+    submissionId: string,
     nameVariant?: string
   ) {
-    this.payload = { item1, item2, relationshipType, nameVariant };
+    this.payload = { item1, item2, relationshipType, submissionId, nameVariant };
+  }
+}
+
+export class UpdateRelationshipAction implements Action {
+  type = RelationshipActionTypes.UPDATE_RELATIONSHIP;
+
+  payload: {
+    relationship: Relationship;
+    submissionId: string;
+  };
+
+  /**
+   * Create a new UpdateRelationshipAction
+   *
+   * @param relationship The relationship
+   * @param submissionId The current submissionId
+   */
+  constructor(
+    relationship: Relationship,
+    submissionId: string,
+  ) {
+    this.payload = { relationship, submissionId };
   }
 }
 
@@ -81,6 +111,7 @@ export class RemoveRelationshipAction implements Action {
     item1: Item;
     item2: Item;
     relationshipType: string;
+    submissionId: string;
   };
 
   /**
@@ -89,12 +120,15 @@ export class RemoveRelationshipAction implements Action {
    * @param item1 The first item in the relationship
    * @param item2 The second item in the relationship
    * @param relationshipType The label of the relationshipType
+   * @param submissionId The current submissionId
    */
   constructor(
     item1: Item,
     item2: Item,
-    relationshipType: string) {
-    this.payload = { item1, item2, relationshipType };
+    relationshipType: string,
+    submissionId: string
+  ) {
+    this.payload = { item1, item2, relationshipType, submissionId };
   }
 }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
index 32067b8b3a8..bada1d07165 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
@@ -16,6 +16,11 @@ import * as operators from 'rxjs/operators';
 import { last } from 'rxjs/operators';
 import { ItemType } from '../../../../../core/shared/item-relationships/item-type.model';
 import { RestResponse } from '../../../../../core/cache/response.models';
+import { Store } from '@ngrx/store';
+import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
+import { RequestService } from '../../../../../core/data/request.service';
 
 describe('RelationshipEffects', () => {
   let relationEffects: RelationshipEffects;
@@ -98,7 +103,14 @@ describe('RelationshipEffects', () => {
         RelationshipEffects,
         provideMockActions(() => actions),
         { provide: RelationshipTypeService, useValue: mockRelationshipTypeService },
-        { provide: RelationshipService, useValue: mockRelationshipService }
+        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: SubmissionObjectDataService, useValue: {
+          findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem())},
+          getHrefByID: () => observableOf('')
+        },
+        { provide: Store, useValue: jasmine.createSpyObj('store', ['dispatch']) },
+        { provide: ObjectCacheService, useValue: {}},
+        { provide: RequestService, useValue: {}},
       ],
     });
   }));
@@ -112,10 +124,15 @@ describe('RelationshipEffects', () => {
     describe('When an ADD_RELATIONSHIP action is triggered', () => {
       describe('When it\'s the first time for this identifier', () => {
         let action;
+
+        beforeEach(() => {
+          spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v.pipe(last()));
+        });
+
         it('should set the current value debounceMap and the value of the initialActionMap to ADD_RELATIONSHIP', () => {
-          action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-          actions = hot('--a-', { a: action });
-          const expected = cold('--b-', { b: undefined });
+          action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+          actions = hot('--a-|', { a: action });
+          const expected = cold('--b-|', { b: undefined });
           expect(relationEffects.mapLastActions$).toBeObservable(expected);
 
           expect((relationEffects as any).initialActionMap[identifier]).toBe(action.type);
@@ -127,14 +144,17 @@ describe('RelationshipEffects', () => {
         let action;
         const testActionType = 'TEST_TYPE';
         beforeEach(() => {
+          spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v);
+
           (relationEffects as any).initialActionMap[identifier] = testActionType;
           (relationEffects as any).debounceMap[identifier] = new BehaviorSubject<string>(testActionType);
         });
 
         it('should set the current value debounceMap to ADD_RELATIONSHIP but not change the value of the initialActionMap', () => {
-          action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-          actions = hot('--a-', { a: action });
-          const expected = cold('--b-', { b: undefined });
+          action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+          actions = hot('--a-|', { a: action });
+
+          const expected = cold('--b-|', { b: undefined });
           expect(relationEffects.mapLastActions$).toBeObservable(expected);
 
           expect((relationEffects as any).initialActionMap[identifier]).toBe(testActionType);
@@ -151,11 +171,11 @@ describe('RelationshipEffects', () => {
             spyOn((relationEffects as any), 'addRelationship');
           });
           it('should call addRelationship on the effect', () => {
-            action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-            actions = hot('--a-', { a: action });
-            const expected = cold('--b-', { b: undefined });
+            action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+            actions = hot('--a-|', { a: action });
+            const expected = cold('--b-|', { b: undefined });
             expect(relationEffects.mapLastActions$).toBeObservable(expected);
-            expect((relationEffects as any).addRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType, undefined)
+            expect((relationEffects as any).addRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType, '1234', undefined)
           });
         });
 
@@ -169,10 +189,10 @@ describe('RelationshipEffects', () => {
             spyOn((relationEffects as any), 'removeRelationship');
           });
           it('should <b>not</b> call removeRelationship or addRelationship on the effect', () => {
-            const actiona = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-            const actionb = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-            actions = hot('--ab-', { a: actiona, b: actionb });
-            const expected = cold('--bb-', { b: undefined });
+            const actiona = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+            const actionb = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+            actions = hot('--ab-|', { a: actiona, b: actionb });
+            const expected = cold('--bb-|', { b: undefined });
             expect(relationEffects.mapLastActions$).toBeObservable(expected);
             expect((relationEffects as any).addRelationship).not.toHaveBeenCalled();
             expect((relationEffects as any).removeRelationship).not.toHaveBeenCalled();
@@ -184,10 +204,14 @@ describe('RelationshipEffects', () => {
     describe('When an REMOVE_RELATIONSHIP action is triggered', () => {
       describe('When it\'s the first time for this identifier', () => {
         let action;
+        beforeEach(() => {
+          spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v.pipe(last()));
+        });
+
         it('should set the current value debounceMap and the value of the initialActionMap to REMOVE_RELATIONSHIP', () => {
-          action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-          actions = hot('--a-', { a: action });
-          const expected = cold('--b-', { b: undefined });
+          action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+          actions = hot('--a-|', { a: action });
+          const expected = cold('--b-|', { b: undefined });
           expect(relationEffects.mapLastActions$).toBeObservable(expected);
 
           expect((relationEffects as any).initialActionMap[identifier]).toBe(action.type);
@@ -199,14 +223,16 @@ describe('RelationshipEffects', () => {
         let action;
         const testActionType = 'TEST_TYPE';
         beforeEach(() => {
+          spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v);
+
           (relationEffects as any).initialActionMap[identifier] = testActionType;
           (relationEffects as any).debounceMap[identifier] = new BehaviorSubject<string>(testActionType);
         });
 
         it('should set the current value debounceMap to REMOVE_RELATIONSHIP but not change the value of the initialActionMap', () => {
-          action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-          actions = hot('--a-', { a: action });
-          const expected = cold('--b-', { b: undefined });
+          action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+          actions = hot('--a-|', { a: action });
+          const expected = cold('--b-|', { b: undefined });
           expect(relationEffects.mapLastActions$).toBeObservable(expected);
 
           expect((relationEffects as any).initialActionMap[identifier]).toBe(testActionType);
@@ -224,11 +250,11 @@ describe('RelationshipEffects', () => {
           });
 
           it('should call removeRelationship on the effect', () => {
-            action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-            actions = hot('--a-', { a: action });
-            const expected = cold('--b-', { b: undefined });
+            action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+            actions = hot('--a-|', { a: action });
+            const expected = cold('--b-|', { b: undefined });
             expect(relationEffects.mapLastActions$).toBeObservable(expected);
-            expect((relationEffects as any).removeRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType)
+            expect((relationEffects as any).removeRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType, '1234', )
           });
         });
 
@@ -242,10 +268,10 @@ describe('RelationshipEffects', () => {
             spyOn((relationEffects as any), 'removeRelationship');
           });
           it('should <b>not</b> call addRelationship or removeRelationship on the effect', () => {
-            const actionb = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-            const actiona = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
-            actions = hot('--ab-', { a: actiona, b: actionb });
-            const expected = cold('--bb-', { b: undefined });
+            const actionb = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+            const actiona = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType, '1234');
+            actions = hot('--ab-|', { a: actiona, b: actionb });
+            const expected = cold('--bb-|', { b: undefined });
             expect(relationEffects.mapLastActions$).toBeObservable(expected);
             expect((relationEffects as any).addRelationship).not.toHaveBeenCalled();
             expect((relationEffects as any).removeRelationship).not.toHaveBeenCalled();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
index 201d50e511a..53dc0d332c9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
@@ -1,17 +1,37 @@
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
-import { debounceTime, map, mergeMap, take, tap } from 'rxjs/operators';
-import { BehaviorSubject } from 'rxjs';
+import { debounceTime, filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { RelationshipService } from '../../../../../core/data/relationship.service';
-import { getSucceededRemoteData } from '../../../../../core/shared/operators';
-import { AddRelationshipAction, RelationshipAction, RelationshipActionTypes, RemoveRelationshipAction, UpdateRelationshipAction } from './relationship.actions';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData
+} from '../../../../../core/shared/operators';
+import {
+  AddRelationshipAction,
+  RelationshipAction,
+  RelationshipActionTypes,
+  UpdateRelationshipAction,
+  UpdateRelationshipNameVariantAction
+} from './relationship.actions';
 import { Item } from '../../../../../core/shared/item.model';
-import { hasNoValue, hasValue, hasValueOperator } from '../../../../empty.util';
+import { hasNoValue, hasValue } from '../../../../empty.util';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
 import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
+import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions';
+import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
+import { SubmissionState } from '../../../../../submission/submission.reducers';
+import { Store } from '@ngrx/store';
+import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
+import { RequestService } from '../../../../../core/data/request.service';
+import { ServerSyncBufferActionTypes } from '../../../../../core/cache/server-sync-buffer.actions';
+import { JsonPatchOperationsActionTypes } from '../../../../../core/json-patch/json-patch-operations.actions';
+import { followLink } from '../../../../utils/follow-link-config.model';
+import { RemoteData } from '../../../../../core/data/remote-data';
 
-const DEBOUNCE_TIME = 5000;
+const DEBOUNCE_TIME = 500;
 
 /**
  * NGRX effects for RelationshipEffects
@@ -33,6 +53,8 @@ export class RelationshipEffects {
     [identifier: string]: string
   } = {};
 
+  private updateAfterPatchSubmissionId: string;
+
   /**
    * Effect that makes sure all last fired RelationshipActions' types are stored in the map of this service, with the object uuid as their key
    */
@@ -40,7 +62,7 @@ export class RelationshipEffects {
     .pipe(
       ofType(RelationshipActionTypes.ADD_RELATIONSHIP, RelationshipActionTypes.REMOVE_RELATIONSHIP),
       map((action: RelationshipAction) => {
-          const { item1, item2, relationshipType } = action.payload;
+          const { item1, item2, submissionId, relationshipType } = action.payload;
           const identifier: string = this.createIdentifier(item1, item2, relationshipType);
           if (hasNoValue(this.debounceMap[identifier])) {
             this.initialActionMap[identifier] = action.type;
@@ -57,13 +79,14 @@ export class RelationshipEffects {
                       nameVariant = this.nameVariantUpdates[identifier];
                       delete this.nameVariantUpdates[identifier];
                     }
-                    this.addRelationship(item1, item2, relationshipType, nameVariant)
+                    this.addRelationship(item1, item2, relationshipType, submissionId, nameVariant);
                   } else {
-                    this.removeRelationship(item1, item2, relationshipType);
+                    this.removeRelationship(item1, item2, relationshipType, submissionId);
                   }
                 }
                 delete this.debounceMap[identifier];
                 delete this.initialActionMap[identifier];
+
               }
             )
           } else {
@@ -80,25 +103,56 @@ export class RelationshipEffects {
    */
   @Effect({ dispatch: false }) updateNameVariantsActions$ = this.actions$
     .pipe(
-      ofType(RelationshipActionTypes.UPDATE_RELATIONSHIP),
-      map((action: UpdateRelationshipAction) => {
-          const { item1, item2, relationshipType, nameVariant } = action.payload;
+      ofType(RelationshipActionTypes.UPDATE_NAME_VARIANT),
+      map((action: UpdateRelationshipNameVariantAction) => {
+          const { item1, item2, relationshipType, submissionId, nameVariant } = action.payload;
           const identifier: string = this.createIdentifier(item1, item2, relationshipType);
           const inProgress = hasValue(this.debounceMap[identifier]);
           if (inProgress) {
             this.nameVariantUpdates[identifier] = nameVariant;
           } else {
-            this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant)
-              .pipe(getSucceededRemoteData())
-              .subscribe();
+            this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant).pipe(
+              filter((relationshipRD: RemoteData<Relationship>) => hasValue(relationshipRD.payload)),
+              take(1)
+            ).subscribe((c) => {
+              this.updateAfterPatchSubmissionId = submissionId;
+              this.relationshipService.refreshRelationshipItemsInCache(item1);
+              this.relationshipService.refreshRelationshipItemsInCache(item2);
+            });
           }
         }
       )
     );
 
+  /**
+   * Save the latest submission ID, to make sure it's updated when the patch is finished
+   */
+  @Effect({ dispatch: false }) updateRelationshipActions$ = this.actions$
+    .pipe(
+      ofType(RelationshipActionTypes.UPDATE_RELATIONSHIP),
+      map((action: UpdateRelationshipAction) => {
+        this.updateAfterPatchSubmissionId = action.payload.submissionId;
+      })
+    );
+
+  /**
+   * Save the submission object with ID updateAfterPatchSubmissionId
+   */
+  @Effect() saveSubmissionSection = this.actions$
+    .pipe(
+      ofType(ServerSyncBufferActionTypes.EMPTY, JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS),
+      filter(() => hasValue(this.updateAfterPatchSubmissionId)),
+      switchMap(() => this.refreshWorkspaceItemInCache(this.updateAfterPatchSubmissionId)),
+      map((submissionObject) => new SaveSubmissionSectionFormSuccessAction(this.updateAfterPatchSubmissionId, [submissionObject], false))
+    );
+
   constructor(private actions$: Actions,
               private relationshipService: RelationshipService,
               private relationshipTypeService: RelationshipTypeService,
+              private submissionObjectService: SubmissionObjectDataService,
+              private store: Store<SubmissionState>,
+              private objectCache: ObjectCacheService,
+              private requestService: RequestService
   ) {
   }
 
@@ -106,7 +160,7 @@ export class RelationshipEffects {
     return `${item1.uuid}-${item2.uuid}-${relationshipType}`;
   }
 
-  private addRelationship(item1: Item, item2: Item, relationshipType: string, nameVariant?: string) {
+  private addRelationship(item1: Item, item2: Item, relationshipType: string, submissionId: string, nameVariant?: string) {
     const type1: string = item1.firstMetadataValue('relationship.type');
     const type2: string = item2.firstMetadataValue('relationship.type');
     return this.relationshipTypeService.getRelationshipTypeByLabelAndTypes(relationshipType, type1, type2)
@@ -119,17 +173,40 @@ export class RelationshipEffects {
               return this.relationshipService.addRelationship(type.id, item1, item2, undefined, nameVariant);
             }
           }
-        )
-      ).pipe(take(1))
-      .subscribe();
+        ),
+        take(1),
+        switchMap(() => this.refreshWorkspaceItemInCache(submissionId)),
+      ).subscribe((submissionObject: SubmissionObject) => this.store.dispatch(new SaveSubmissionSectionFormSuccessAction(submissionId, [submissionObject], false)));
   }
 
-  private removeRelationship(item1: Item, item2: Item, relationshipType: string) {
+  private removeRelationship(item1: Item, item2: Item, relationshipType: string, submissionId: string) {
     this.relationshipService.getRelationshipByItemsAndLabel(item1, item2, relationshipType).pipe(
-      take(1),
-      hasValueOperator(),
       mergeMap((relationship: Relationship) => this.relationshipService.deleteRelationship(relationship.id, 'none')),
-      take(1)
-    ).subscribe();
+      take(1),
+      switchMap(() => this.refreshWorkspaceItemInCache(submissionId)),
+    ).subscribe((submissionObject: SubmissionObject) => {
+      this.store.dispatch(new SaveSubmissionSectionFormSuccessAction(submissionId, [submissionObject], false))
+    });
+  }
+
+  /**
+   * Make sure the SubmissionObject is refreshed in the cache after being used
+   * @param submissionId The ID of the submission object
+   */
+  private refreshWorkspaceItemInCache(submissionId: string): Observable<SubmissionObject> {
+    return this.submissionObjectService.getHrefByID(submissionId).pipe(take(1)).pipe(
+      switchMap((href: string) => {
+        this.objectCache.remove(href);
+        this.requestService.removeByHrefSubstring(submissionId);
+        return combineLatest(
+          this.objectCache.hasByHref$(href),
+          this.requestService.hasByHref$(href)
+        ).pipe(
+          filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
+          take(1),
+          switchMap(() => this.submissionObjectService.findById(submissionId, false, followLink('item')).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload()) as Observable<SubmissionObject>)
+        )
+      })
+    );
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 36197b33c4a..a1b1561e365 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -55,6 +55,7 @@
                 </div>
             </div>
         </div>
+
         <ds-search-results [searchResults]="(resultsRD$ | async)"
                            [sortConfig]="this.lookupRelationService.searchConfig?.sort"
                            [searchConfig]="this.lookupRelationService.searchConfig"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index 8db75261ee1..f90cf79e28c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -12,7 +12,7 @@ import { RelationshipOptions } from '../../../models/relationship-options.model'
 import { of as observableOf } from 'rxjs';
 import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
-import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../../core/shared/item.model';
 import { ActivatedRoute } from '@angular/router';
@@ -39,7 +39,7 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
   let lookupRelationService;
 
   function init() {
-    relationship = { filter: 'filter', relationshipType: 'isAuthorOfPublication', nameVariants: true } as RelationshipOptions;
+    relationship = Object.assign(new RelationshipOptions(), { filter: 'filter', relationshipType: 'isAuthorOfPublication', nameVariants: true, searchConfiguration: 'personConfig' });
     pSearchOptions = new PaginatedSearchOptions({});
     item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
     item2 = Object.assign(new Item(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
@@ -52,7 +52,7 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
     listID = '6b0c8221-fcb4-47a8-b483-ca32363fffb3';
     selection$ = observableOf([searchResult1, searchResult2]);
 
-    results = new PaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
+    results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
     selectableListService = jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']);
     lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
       getLocalResults: createSuccessfulRemoteDataObject$(results)
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 94846316102..da7630ed44f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -2,21 +2,19 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu
 import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { Item } from '../../../../../../core/shared/item.model';
-import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
 import { SearchResult } from '../../../../../search/search-result.model';
-import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../../core/data/remote-data';
-import { Observable, ReplaySubject } from 'rxjs';
+import { Observable } from 'rxjs';
 import { RelationshipOptions } from '../../../models/relationship-options.model';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { hasValue, isNotEmpty } from '../../../../../empty.util';
-import { concat, map, multicast, switchMap, take, takeWhile, tap } from 'rxjs/operators';
-import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
-import { getSucceededRemoteData } from '../../../../../../core/shared/operators';
+import { hasValue } from '../../../../../empty.util';
+import { map, startWith, switchMap, take, tap } from 'rxjs/operators';
+import { getFirstSucceededRemoteData } from '../../../../../../core/shared/operators';
 import { RouteService } from '../../../../../../core/services/route.service';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { Context } from '../../../../../../core/shared/context.model';
@@ -47,6 +45,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    * The ID of the list to add/remove selected items to/from
    */
   @Input() listId: string;
+  @Input() query: string;
 
   /**
    * Is the selection repeatable?
@@ -101,10 +100,10 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
   /**
    * The initial pagination to use
    */
-  initialPagination = Object.assign(new PaginationComponentOptions(), {
-    id: 'submission-relation-list',
+  initialPagination = {
+    page: 1,
     pageSize: 5
-  });
+  };
 
   /**
    * The type of links to display
@@ -129,10 +128,8 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.resetRoute();
     this.routeService.setParameter('fixedFilterQuery', this.relationship.filter);
     this.routeService.setParameter('configuration', this.relationship.searchConfiguration);
-
-    this.someSelected$ = this.selection$.pipe(map((selection) => isNotEmpty(selection)));
     this.resultsRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
-      switchMap((options) => this.lookupRelationService.getLocalResults(this.relationship, options))
+      switchMap((options) => this.lookupRelationService.getLocalResults(this.relationship, options).pipe(startWith(undefined)))
     );
   }
 
@@ -141,7 +138,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    */
   resetRoute() {
     this.router.navigate([], {
-      queryParams: Object.assign({}, { pageSize: this.initialPagination.pageSize }, this.route.snapshot.queryParams, { page: 1 })
+      queryParams: Object.assign({ query: this.query }, this.route.snapshot.queryParams, this.initialPagination),
     });
   }
 
@@ -185,9 +182,9 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
       pageSize: 9999
     });
     const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
-    const results$ = this.searchService.search(fullSearchConfig) as Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
+    const results$ = this.searchService.search<Item>(fullSearchConfig);
     results$.pipe(
-      getSucceededRemoteData(),
+      getFirstSucceededRemoteData(),
       map((resultsRD) => resultsRD.payload.page),
       tap(() => this.selectAllLoading = false),
     ).subscribe((results) => {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
index 46ee1727fed..cd55553f5b4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
@@ -8,7 +8,7 @@ <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings'
             {{'submission.sections.describe.relationship-lookup.selection-tab.no-selection' | translate}}
         </div>
         <div *ngIf="(selectionRD$ | async)?.payload.page.length >= 1">
-            <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + label | translate}}</h3>
+            <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + relationshipType | translate}}</h3>
             <ds-viewable-collection [objects]="selectionRD$ | async"
                                     [selectable]="true"
                                     [selectionConfig]="{ repeatable: repeatable, listId: listId }"
@@ -20,4 +20,4 @@ <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' +
             ></ds-viewable-collection>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
index eeea96e64ba..92541831097 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
@@ -12,7 +12,10 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { Router } from '@angular/router';
 import { By } from '@angular/platform-browser';
 import { RemoteData } from '../../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import {
+  PaginatedList,
+  buildPaginatedList
+} from '../../../../../../core/data/paginated-list.model';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
 
@@ -88,5 +91,5 @@ describe('DsDynamicLookupRelationSelectionTabComponent', () => {
 });
 
 function createSelection(content: ListableObject[]): Observable<RemoteData<PaginatedList<ListableObject>>> {
-  return createSuccessfulRemoteDataObject$(new PaginatedList(undefined, content));
+  return createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, content));
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index a918b519307..9dc574c7a76 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -6,7 +6,10 @@ import { ListableObject } from '../../../../../object-collection/shared/listable
 import { RemoteData } from '../../../../../../core/data/remote-data';
 import { map, switchMap, take } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import {
+  PaginatedList,
+  buildPaginatedList
+} from '../../../../../../core/data/paginated-list.model';
 import { Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
@@ -30,9 +33,9 @@ import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.uti
  */
 export class DsDynamicLookupRelationSelectionTabComponent {
   /**
-   * The label to use to display i18n messages (describing the type of relationship)
+   * A string that describes the type of relationship
    */
-  @Input() label: string;
+  @Input() relationshipType: string;
 
   /**
    * The ID of the list to add/remove selected items to/from
@@ -102,7 +105,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
                   currentPage: pagination.currentPage,
                   totalPages: Math.ceil(selected.length / pagination.pageSize)
                 });
-              return createSuccessfulRemoteDataObject(new PaginatedList(pageInfo, selection));
+              return createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, selection));
             })
           );
         })
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 972abb68b55..46d058aae40 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -34,9 +34,9 @@ import { DynamicScrollableDropdownModel } from './ds-dynamic-form-ui/models/scro
 import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { DynamicLookupModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { DynamicDsDatePickerModel } from './ds-dynamic-form-ui/models/date-picker/date-picker.model';
-import { DynamicTypeaheadModel } from './ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.model';
+import { DynamicOneboxModel } from './ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
 import { DynamicListRadioGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
-import { AuthorityOptions } from '../../../core/integration/models/authority-options.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { FormFieldModel } from './models/form-field.model';
 import {
   SubmissionFormsModel
@@ -56,10 +56,10 @@ describe('FormBuilderService test suite', () => {
   let testFormConfiguration: SubmissionFormsModel;
   let service: FormBuilderService;
 
-  const submissionId =  '1234';
+  const submissionId = '1234';
 
   function testValidator() {
-    return {testValidator: {valid: true}};
+    return { testValidator: { valid: true } };
   }
 
   function testAsyncValidator() {
@@ -71,18 +71,16 @@ describe('FormBuilderService test suite', () => {
     TestBed.configureTestingModule({
       imports: [ReactiveFormsModule],
       providers: [
-        {provide: FormBuilderService, useClass: FormBuilderService},
-        {provide: DynamicFormValidationService, useValue: {}},
-        {provide: NG_VALIDATORS, useValue: testValidator, multi: true},
-        {provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true}
+        { provide: FormBuilderService, useClass: FormBuilderService },
+        { provide: DynamicFormValidationService, useValue: {} },
+        { provide: NG_VALIDATORS, useValue: testValidator, multi: true },
+        { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true }
       ]
     });
 
-    const authorityOptions: AuthorityOptions = {
-      closed: false,
-      metadata: 'list',
+    const vocabularyOptions: VocabularyOptions = {
       name: 'type_programme',
-      scope: 'c1c16450-d56f-41bc-bb81-27f1d1eb5c23'
+      closed: false
     };
 
     testModel = [
@@ -148,9 +146,9 @@ describe('FormBuilderService test suite', () => {
         }
       ),
 
-      new DynamicTextAreaModel({id: 'testTextArea'}),
+      new DynamicTextAreaModel({ id: 'testTextArea' }),
 
-      new DynamicCheckboxModel({id: 'testCheckbox'}),
+      new DynamicCheckboxModel({ id: 'testCheckbox' }),
 
       new DynamicFormArrayModel(
         {
@@ -158,10 +156,10 @@ describe('FormBuilderService test suite', () => {
           initialCount: 5,
           groupFactory: () => {
             return [
-              new DynamicInputModel({id: 'testFormArrayGroupInput'}),
+              new DynamicInputModel({ id: 'testFormArrayGroupInput' }),
               new DynamicFormArrayModel({
                 id: 'testNestedFormArray', groupFactory: () => [
-                  new DynamicInputModel({id: 'testNestedFormArrayGroupInput'})
+                  new DynamicInputModel({ id: 'testNestedFormArrayGroupInput' })
                 ]
               })
             ];
@@ -173,37 +171,37 @@ describe('FormBuilderService test suite', () => {
         {
           id: 'testFormGroup',
           group: [
-            new DynamicInputModel({id: 'nestedTestInput'}),
-            new DynamicTextAreaModel({id: 'nestedTestTextArea'})
+            new DynamicInputModel({ id: 'nestedTestInput' }),
+            new DynamicTextAreaModel({ id: 'nestedTestTextArea' })
           ]
         }
       ),
 
-      new DynamicSliderModel({id: 'testSlider'}),
+      new DynamicSliderModel({ id: 'testSlider' }),
 
-      new DynamicSwitchModel({id: 'testSwitch'}),
+      new DynamicSwitchModel({ id: 'testSwitch' }),
 
-      new DynamicDatePickerModel({id: 'testDatepicker', value: new Date()}),
+      new DynamicDatePickerModel({ id: 'testDatepicker', value: new Date() }),
 
-      new DynamicFileUploadModel({id: 'testFileUpload'}),
+      new DynamicFileUploadModel({ id: 'testFileUpload' }),
 
-      new DynamicEditorModel({id: 'testEditor'}),
+      new DynamicEditorModel({ id: 'testEditor' }),
 
-      new DynamicTimePickerModel({id: 'testTimePicker'}),
+      new DynamicTimePickerModel({ id: 'testTimePicker' }),
 
-      new DynamicRatingModel({id: 'testRating'}),
+      new DynamicRatingModel({ id: 'testRating' }),
 
-      new DynamicColorPickerModel({id: 'testColorPicker'}),
+      new DynamicColorPickerModel({ id: 'testColorPicker' }),
 
-      new DynamicTypeaheadModel({id: 'testTypeahead', repeatable: false, metadataFields: [], submissionId: '1234'}),
+      new DynamicOneboxModel({ id: 'testOnebox', repeatable: false, metadataFields: [], submissionId: '1234', hasSelectableMetadata: false }),
 
-      new DynamicScrollableDropdownModel({id: 'testScrollableDropdown', authorityOptions: authorityOptions, repeatable: false, metadataFields: [], submissionId: '1234'}),
+      new DynamicScrollableDropdownModel({ id: 'testScrollableDropdown', vocabularyOptions: vocabularyOptions, repeatable: false, metadataFields: [], submissionId: '1234', hasSelectableMetadata: false }),
 
-      new DynamicTagModel({id: 'testTag', repeatable: false, metadataFields: [], submissionId: '1234'}),
+      new DynamicTagModel({ id: 'testTag', repeatable: false, metadataFields: [], submissionId: '1234', hasSelectableMetadata: false }),
 
-      new DynamicListCheckboxGroupModel({id: 'testCheckboxList', authorityOptions: authorityOptions, repeatable: true}),
+      new DynamicListCheckboxGroupModel({id: 'testCheckboxList', vocabularyOptions: vocabularyOptions, repeatable: true}),
 
-      new DynamicListRadioGroupModel({id: 'testRadioList', authorityOptions: authorityOptions, repeatable: false}),
+      new DynamicListRadioGroupModel({id: 'testRadioList', vocabularyOptions: vocabularyOptions, repeatable: false}),
 
       new DynamicRelationGroupModel({
         submissionId,
@@ -211,28 +209,28 @@ describe('FormBuilderService test suite', () => {
         formConfiguration: [{
           fields: [{
             hints: 'Enter the name of the author.',
-            input: {type: 'onebox'},
+            input: { type: 'onebox' },
             label: 'Authors',
             languageCodes: [],
             mandatory: 'true',
             mandatoryMessage: 'Required field!',
             repeatable: false,
             selectableMetadata: [{
-              authority: 'RPAuthority',
+              controlledVocabulary: 'RPAuthority',
               closed: false,
               metadata: 'dc.contributor.author'
-            }],
+            }]
           } as FormFieldModel]
         } as FormRowModel, {
           fields: [{
             hints: 'Enter the affiliation of the author.',
-            input: {type: 'onebox'},
+            input: { type: 'onebox' },
             label: 'Affiliation',
             languageCodes: [],
             mandatory: 'false',
             repeatable: false,
             selectableMetadata: [{
-              authority: 'OUAuthority',
+              controlledVocabulary: 'OUAuthority',
               closed: false,
               metadata: 'local.contributor.affiliation'
             }]
@@ -244,29 +242,35 @@ describe('FormBuilderService test suite', () => {
         scopeUUID: '',
         submissionScope: '',
         repeatable: false,
-        metadataFields: []
+        metadataFields: [],
+        hasSelectableMetadata: true
       }),
 
-      new DynamicDsDatePickerModel({id: 'testDate'}),
+      new DynamicDsDatePickerModel({ id: 'testDate' }),
 
-      new DynamicLookupModel({id: 'testLookup', repeatable: false, metadataFields: [], submissionId: '1234'}),
+      new DynamicLookupModel({ id: 'testLookup', repeatable: false, metadataFields: [], submissionId: '1234', hasSelectableMetadata: true }),
 
-      new DynamicLookupNameModel({id: 'testLookupName', repeatable: false, metadataFields: [], submissionId: '1234'}),
+      new DynamicLookupNameModel({ id: 'testLookupName', repeatable: false, metadataFields: [], submissionId: '1234', hasSelectableMetadata: true }),
 
-      new DynamicQualdropModel({id: 'testCombobox', readOnly: false, required: false}),
+      new DynamicQualdropModel({ id: 'testCombobox', readOnly: false, required: false }),
 
       new DynamicRowArrayModel(
         {
           id: 'testFormRowArray',
           initialCount: 5,
           notRepeatable: false,
+          relationshipConfig: undefined,
+          submissionId: '1234',
           groupFactory: () => {
             return [
-              new DynamicInputModel({id: 'testFormRowArrayGroupInput'})
+              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })
             ];
           },
-          required: false
-        }
+          required: false,
+          metadataKey: 'dc.contributor.author',
+          metadataFields: ['dc.contributor.author'],
+          hasSelectableMetadata: true
+        },
       ),
     ];
 
@@ -284,7 +288,7 @@ describe('FormBuilderService test suite', () => {
               selectableMetadata: [
                 {
                   metadata: 'journal',
-                  authority: 'JOURNALAuthority',
+                  controlledVocabulary: 'JOURNALAuthority',
                   closed: false
                 }
               ],
@@ -364,7 +368,7 @@ describe('FormBuilderService test suite', () => {
               selectableMetadata: [
                 {
                   metadata: 'conference',
-                  authority: 'EVENTAuthority',
+                  controlledVocabulary: 'EVENTAuthority',
                   closed: false
                 }
               ],
@@ -433,7 +437,7 @@ describe('FormBuilderService test suite', () => {
 
     expect(formModel[2] instanceof DynamicRowGroupModel).toBe(true);
     expect((formModel[2] as DynamicRowGroupModel).group.length).toBe(1);
-    expect((formModel[2] as DynamicRowGroupModel).get(0) instanceof DynamicTypeaheadModel).toBe(true);
+    expect((formModel[2] as DynamicRowGroupModel).get(0) instanceof DynamicOneboxModel).toBe(true);
   });
 
   it('should return form\'s fields value from form model', () => {
@@ -449,7 +453,7 @@ describe('FormBuilderService test suite', () => {
     };
     expect(service.getValueFromModel(formModel)).toEqual(value);
 
-    ((formModel[2] as DynamicRowGroupModel).get(0) as DynamicTypeaheadModel).valueUpdates.next('test one');
+    ((formModel[2] as DynamicRowGroupModel).get(0) as DynamicOneboxModel).valueUpdates.next('test one');
     value = {
       issue: [new FormFieldMetadataValueObject('test')],
       conference: [new FormFieldMetadataValueObject('test one')]
@@ -462,11 +466,11 @@ describe('FormBuilderService test suite', () => {
     const value = {} as any;
 
     ((formModel[0] as DynamicRowGroupModel).get(1) as DsDynamicInputModel).valueUpdates.next('test');
-    ((formModel[2] as DynamicRowGroupModel).get(0) as DynamicTypeaheadModel).valueUpdates.next('test one');
+    ((formModel[2] as DynamicRowGroupModel).get(0) as DynamicOneboxModel).valueUpdates.next('test one');
 
     service.clearAllModelsValue(formModel);
-    expect(((formModel[0] as DynamicRowGroupModel).get(1) as DynamicTypeaheadModel).value).toEqual(undefined)
-    expect(((formModel[2] as DynamicRowGroupModel).get(0) as DynamicTypeaheadModel).value).toEqual(undefined)
+    expect(((formModel[0] as DynamicRowGroupModel).get(1) as DynamicOneboxModel).value).toEqual(undefined)
+    expect(((formModel[2] as DynamicRowGroupModel).get(0) as DynamicOneboxModel).value).toEqual(undefined)
   });
 
   it('should return true when model has a custom group model as parent', () => {
@@ -628,7 +632,7 @@ describe('FormBuilderService test suite', () => {
 
   it('should throw when unknown DynamicFormControlModel id is specified in JSON', () => {
 
-    expect(() => service.fromJSON([{id: 'test'}]))
+    expect(() => service.fromJSON([{ id: 'test' }]))
       .toThrow(new Error(`unknown form control model type defined on JSON object with id "test"`));
   });
 
@@ -648,8 +652,8 @@ describe('FormBuilderService test suite', () => {
     const formGroup = service.createFormGroup(testModel);
     const nestedFormGroup = formGroup.controls.testFormGroup as FormGroup;
     const nestedFormGroupModel = testModel[7] as DynamicFormGroupModel;
-    const newModel1 = new DynamicInputModel({id: 'newInput1'});
-    const newModel2 = new DynamicInputModel({id: 'newInput2'});
+    const newModel1 = new DynamicInputModel({ id: 'newInput1' });
+    const newModel2 = new DynamicInputModel({ id: 'newInput2' });
 
     service.addFormGroupControl(formGroup, testModel, newModel1);
     service.addFormGroupControl(nestedFormGroup, nestedFormGroupModel, newModel2);
@@ -666,8 +670,8 @@ describe('FormBuilderService test suite', () => {
     const formGroup = service.createFormGroup(testModel);
     const nestedFormGroup = formGroup.controls.testFormGroup as FormGroup;
     const nestedFormGroupModel = testModel[7] as DynamicFormGroupModel;
-    const newModel1 = new DynamicInputModel({id: 'newInput1'});
-    const newModel2 = new DynamicInputModel({id: 'newInput2'});
+    const newModel1 = new DynamicInputModel({ id: 'newInput1' });
+    const newModel2 = new DynamicInputModel({ id: 'newInput2' });
 
     service.insertFormGroupControl(4, formGroup, testModel, newModel1);
     service.insertFormGroupControl(0, nestedFormGroup, nestedFormGroupModel, newModel2);
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 7e657d97d46..c621fe2aa7a 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -7,7 +7,7 @@ import {
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
   DYNAMIC_FORM_CONTROL_TYPE_INPUT,
   DYNAMIC_FORM_CONTROL_TYPE_RADIO_GROUP,
-  DynamicFormArrayModel,
+  DynamicFormArrayModel, DynamicFormControlEvent,
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormService, DynamicFormValidationService,
@@ -16,15 +16,17 @@ import {
 import { isObject, isString, mergeWith } from 'lodash';
 
 import { hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined, isNull } from '../../empty.util';
-import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
+import {DynamicQualdropModel} from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { RowParser } from './parsers/row-parser';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP, DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
 import { isNgbDateStruct } from '../../date.util';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { CONCAT_GROUP_SUFFIX, DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
@@ -53,6 +55,13 @@ export class FormBuilderService extends DynamicFormService {
           break;
         }
 
+        if (this.isConcatGroup(controlModel)) {
+          if (controlModel.id.match(new RegExp(findId + CONCAT_GROUP_SUFFIX + `_\\d+$`))) {
+            result = (controlModel as DynamicConcatModel).group[0];
+            break;
+          }
+        }
+
         if (this.isGroup(controlModel)) {
           findByIdFn(findId, (controlModel as DynamicFormGroupModel).group, findArrayIndex);
         }
@@ -226,7 +235,7 @@ export class FormBuilderService extends DynamicFormService {
   }
 
   hasArrayGroupValue(model: DynamicFormControlModel): boolean {
-    return model && (this.isListGroup(model) || model.type === DYNAMIC_FORM_CONTROL_TYPE_TAG);
+    return model && (this.isListGroup(model) || model.type === DYNAMIC_FORM_CONTROL_TYPE_TAG || model.type === DYNAMIC_FORM_CONTROL_TYPE_ARRAY);
   }
 
   hasMappedGroupValue(model: DynamicFormControlModel): boolean {
@@ -246,6 +255,10 @@ export class FormBuilderService extends DynamicFormService {
     return model && ((model as any).type === DYNAMIC_FORM_CONTROL_TYPE_GROUP && (model as any).isCustomGroup === true);
   }
 
+  isConcatGroup(model: DynamicFormControlModel): boolean {
+    return this.isCustomGroup(model) && (model.id.indexOf(CONCAT_GROUP_SUFFIX) !== -1);
+  }
+
   isRowGroup(model: DynamicFormControlModel): boolean {
     return model && ((model as any).type === DYNAMIC_FORM_CONTROL_TYPE_GROUP && (model as any).isRowGroup === true);
   }
@@ -283,11 +296,16 @@ export class FormBuilderService extends DynamicFormService {
     return isNotEmpty(fieldModel) ? formGroup.get(this.getPath(fieldModel)) : null;
   }
 
+  /**
+   * Note (discovered while debugging) this is not the ID as used in the form,
+   * but the first part of the path needed in a patch operation:
+   * e.g. add foo/0 -> the id is 'foo'
+   */
   getId(model: DynamicPathable): string {
     let tempModel: DynamicFormControlModel;
 
     if (this.isArrayGroup(model as DynamicFormControlModel)) {
-      return model.index.toString();
+      return hasValue((model as any).metadataKey) ? (model as any).metadataKey : model.index.toString();
     } else if (this.isModelInCustomGroup(model as DynamicFormControlModel)) {
       tempModel = (model as any).parent;
     } else {
@@ -297,4 +315,76 @@ export class FormBuilderService extends DynamicFormService {
     return (tempModel.id !== tempModel.name) ? tempModel.name : tempModel.id;
   }
 
+  /**
+   * Calculate the metadata list related to the event.
+   * @param event
+   */
+  getMetadataIdsFromEvent(event: DynamicFormControlEvent): string[] {
+
+    let model = event.model;
+    while (model.parent) {
+      model = model.parent as any;
+    }
+
+    const iterateControlModels = (findGroupModel: DynamicFormControlModel[], controlModelIndex: number = 0): string[] => {
+      let iterateResult = Object.create({});
+
+      // Iterate over all group's controls
+      for (const controlModel of findGroupModel) {
+
+        if (this.isRowGroup(controlModel) && !this.isCustomOrListGroup(controlModel)) {
+          iterateResult = mergeWith(iterateResult, iterateControlModels((controlModel as DynamicFormGroupModel).group));
+          continue;
+        }
+
+        if (this.isGroup(controlModel) && !this.isCustomOrListGroup(controlModel)) {
+          iterateResult[controlModel.name] = iterateControlModels((controlModel as DynamicFormGroupModel).group);
+          continue;
+        }
+
+        if (this.isRowArrayGroup(controlModel)) {
+          for (const arrayItemModel of (controlModel as DynamicRowArrayModel).groups) {
+            iterateResult = mergeWith(iterateResult, iterateControlModels(arrayItemModel.group, arrayItemModel.index));
+          }
+          continue;
+        }
+
+        if (this.isArrayGroup(controlModel)) {
+          iterateResult[controlModel.name] = [];
+          for (const arrayItemModel of (controlModel as DynamicFormArrayModel).groups) {
+            iterateResult[controlModel.name].push(iterateControlModels(arrayItemModel.group, arrayItemModel.index));
+          }
+          continue;
+        }
+
+        let controlId;
+        // Get the field's name
+        if (this.isQualdropGroup(controlModel)) {
+          // If is instance of DynamicQualdropModel take the qualdrop id as field's name
+          controlId = (controlModel as DynamicQualdropModel).qualdropId;
+        } else {
+          controlId = controlModel.name;
+        }
+
+        if (this.isRelationGroup(controlModel)) {
+          const values = (controlModel as DynamicRelationGroupModel).getGroupValue();
+          values.forEach((groupValue, groupIndex) => {
+            Object.keys(groupValue).forEach((key) => {
+              iterateResult[key] = true;
+            });
+          });
+        } else {
+          iterateResult[controlId] = true;
+        }
+
+      }
+
+      return iterateResult;
+    };
+
+    const result = iterateControlModels([model]);
+
+    return Object.keys(result);
+  }
+
 }
diff --git a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
index 45489e3618e..a80dbdc7de2 100644
--- a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
+++ b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
@@ -1,12 +1,15 @@
-import { isEmpty, isNotEmpty, isNotNull } from '../../../empty.util';
-import { ConfidenceType } from '../../../../core/integration/models/confidence-type';
-import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { MetadataValueInterface } from '../../../../core/shared/metadata.models';
+import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../empty.util';
+import { ConfidenceType } from '../../../../core/shared/confidence-type';
+import { MetadataValueInterface, VIRTUAL_METADATA_PREFIX } from '../../../../core/shared/metadata.models';
+import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export interface OtherInformation {
   [name: string]: string
 }
 
+/**
+ * A class representing a specific input-form field's value
+ */
 export class FormFieldMetadataValueObject implements MetadataValueInterface {
   metadata?: string;
   value: any;
@@ -15,7 +18,6 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
   authority: string;
   confidence: ConfidenceType;
   place: number;
-  closed: boolean;
   label: string;
   otherInformation: OtherInformation;
 
@@ -33,7 +35,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     this.display = display || value;
 
     this.confidence = confidence;
-    if (authority != null && isEmpty(confidence)) {
+    if (authority != null && (isEmpty(confidence) || confidence === -1)) {
       this.confidence = ConfidenceType.CF_ACCEPTED;
     } else if (isNotEmpty(confidence)) {
       this.confidence = confidence;
@@ -49,19 +51,54 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     this.otherInformation = otherInformation;
   }
 
+  /**
+   * Returns true if this this object has an authority value
+   */
   hasAuthority(): boolean {
     return isNotEmpty(this.authority);
   }
 
+  /**
+   * Returns true if this this object has a value
+   */
   hasValue(): boolean {
     return isNotEmpty(this.value);
   }
 
+  /**
+   * Returns true if this this object has otherInformation property with value
+   */
   hasOtherInformation(): boolean {
     return isNotEmpty(this.otherInformation);
   }
 
+  /**
+   * Returns true if this object value contains a placeholder
+   */
   hasPlaceholder() {
     return this.hasValue() && this.value === PLACEHOLDER_PARENT_METADATA;
   }
+
+  /**
+   * Returns true if this Metadatum's authority key starts with 'virtual::'
+   */
+  get isVirtual(): boolean {
+    return hasValue(this.authority) && this.authority.startsWith(VIRTUAL_METADATA_PREFIX);
+  }
+
+  /**
+   * If this is a virtual Metadatum, it returns everything in the authority key after 'virtual::'.
+   * Returns undefined otherwise.
+   */
+  get virtualValue(): string {
+    if (this.isVirtual) {
+      return this.authority.substring(this.authority.indexOf(VIRTUAL_METADATA_PREFIX) + VIRTUAL_METADATA_PREFIX.length);
+    } else {
+      return undefined;
+    }
+  }
+
+  toString() {
+    return this.display || this.value;
+  }
 }
diff --git a/src/app/shared/form/builder/models/form-field.model.ts b/src/app/shared/form/builder/models/form-field.model.ts
index 718b3f4f0d8..95ee980aeb8 100644
--- a/src/app/shared/form/builder/models/form-field.model.ts
+++ b/src/app/shared/form/builder/models/form-field.model.ts
@@ -1,50 +1,121 @@
 import { autoserialize } from 'cerialize';
+
 import { LanguageCode } from './form-field-language-value.model';
-import { FormFieldMetadataValueObject } from './form-field-metadata-value.model';
 import { RelationshipOptions } from './relationship-options.model';
 import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 
+/**
+ * Representing SelectableMetadata properties
+ */
+export interface SelectableMetadata {
+  /**
+   * The key of the metadata field to use to store the input
+   */
+  metadata: string;
+
+  /**
+   * The label of the metadata field to use to store the input
+   */
+  label: string;
+
+  /**
+   * The name of the controlled vocabulary used to retrieve value for the input see controlled vocabularies
+   */
+  controlledVocabulary: string;
+
+  /**
+   * A boolean representing if value is closely related to the controlled vocabulary entry or not
+   */
+  closed: boolean;
+}
+
+/**
+ * A class representing a specific input-form field
+ */
 export class FormFieldModel {
 
+  /**
+   * The hints for this metadata field to display on form
+   */
   @autoserialize
   hints: string;
 
+  /**
+   * The label for this metadata field to display on form
+   */
   @autoserialize
   label: string;
 
+  /**
+   * The languages available for this metadata field to display on form
+   */
   @autoserialize
   languageCodes: LanguageCode[];
 
+  /**
+   * The error message for this metadata field to display on form in case of field is required
+   */
   @autoserialize
   mandatoryMessage: string;
 
+  /**
+   * Representing if this metadata field is mandatory or not
+   */
   @autoserialize
   mandatory: string;
 
+  /**
+   * Representing if this metadata field is repeatable or not
+   */
   @autoserialize
   repeatable: boolean;
 
+  /**
+   * Containing additional properties for this metadata field
+   */
   @autoserialize
   input: {
+    /**
+     * Representing the type for this metadata field
+     */
     type: string;
+
+    /**
+     * Containing regex to use for field validation
+     */
     regex?: string;
   };
 
+  /**
+   * Representing additional vocabulary configuration for this metadata field
+   */
   @autoserialize
-  selectableMetadata: FormFieldMetadataValueObject[];
+  selectableMetadata: SelectableMetadata[];
 
+  /**
+   * Representing additional relationship configuration for this metadata field
+   */
   @autoserialize
   selectableRelationship: RelationshipOptions;
 
   @autoserialize
   rows: FormRowModel[];
 
+  /**
+   * Representing the scope for this metadata field
+   */
   @autoserialize
   scope: string;
 
+  /**
+   * Containing additional css classes for this metadata field to use on form
+   */
   @autoserialize
   style: string;
 
+  /**
+   * Containing the value for this metadata field
+   */
   @autoserialize
   value: any;
 }
diff --git a/src/app/shared/form/builder/models/relationship-options.model.ts b/src/app/shared/form/builder/models/relationship-options.model.ts
index f1d3d0ae7ad..031f468f25a 100644
--- a/src/app/shared/form/builder/models/relationship-options.model.ts
+++ b/src/app/shared/form/builder/models/relationship-options.model.ts
@@ -1,4 +1,4 @@
-const RELATION_METADATA_PREFIX = 'relation.'
+const RELATION_METADATA_PREFIX = 'relation.';
 
 /**
  * The submission options for fields that can represent relationships
@@ -7,7 +7,7 @@ export class RelationshipOptions {
   relationshipType: string;
   filter: string;
   searchConfiguration: string;
-  nameVariants: boolean;
+  nameVariants: string;
 
   get metadataField() {
     return RELATION_METADATA_PREFIX + this.relationshipType
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index 33a92c726d2..09a3f53c580 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -13,7 +13,7 @@ import {
   DynamicConcatModel,
   DynamicConcatModelConfig
 } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { isNotEmpty } from '../../../empty.util';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
 import { ParserOptions } from './parser-options';
 import {
   CONFIG_DATA,
@@ -53,14 +53,18 @@ export class ConcatFieldParser extends FieldParser {
     };
 
     const groupId = id.replace(/\./g, '_') + CONCAT_GROUP_SUFFIX;
-    const concatGroup: DynamicConcatModelConfig = this.initModel(groupId, label, false);
+    const concatGroup: DynamicConcatModelConfig = this.initModel(groupId, label, false, true);
 
     concatGroup.group = [];
     concatGroup.separator = this.separator;
 
     const input1ModelConfig: DynamicInputModelConfig = this.initModel(id + CONCAT_FIRST_INPUT_SUFFIX, false, false);
     const input2ModelConfig: DynamicInputModelConfig = this.initModel(id + CONCAT_SECOND_INPUT_SUFFIX, false, false);
-    input2ModelConfig.hint = '&nbsp;';
+
+    if (hasNoValue(concatGroup.hint) && hasValue(input1ModelConfig.hint) && hasNoValue(input2ModelConfig.hint)) {
+      concatGroup.hint = input1ModelConfig.hint;
+      input1ModelConfig.hint = undefined;
+    }
 
     if (this.configData.mandatory) {
       concatGroup.required = true;
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index efa4f3cdb53..b9adf3ed65c 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('DateFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
index c885b737c23..346abda49ac 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('DisabledFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -51,7 +51,7 @@ describe('DisabledFieldParser test suite', () => {
   it('should set init value properly', () => {
     initFormValues = {
       description: [
-        new FormFieldMetadataValueObject('test description'),
+        'test description',
       ],
     };
     const expectedValue ='test description';
@@ -59,7 +59,7 @@ describe('DisabledFieldParser test suite', () => {
     const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
-    expect(fieldModel.value).toEqual(expectedValue);
+    expect(fieldModel.value.value).toEqual(expectedValue);
   });
 
 });
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
index 14d70514666..330c288fe90 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
@@ -9,7 +9,7 @@ export class DisabledFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
     const emptyModelConfig: DsDynamicDisabledModelConfig = this.initModel(null, label);
-    this.setValues(emptyModelConfig, fieldValue);
+    this.setValues(emptyModelConfig, fieldValue, true);
     return new DynamicDisabledModel(emptyModelConfig)
   }
 }
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
index 8dbd68e05a2..82d2aeac63b 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
@@ -11,7 +11,7 @@ describe('DropdownFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -26,7 +26,7 @@ describe('DropdownFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'type',
-          authority: 'common_types_dataset',
+          controlledVocabulary: 'common_types_dataset',
           closed: false
         }
       ],
@@ -50,7 +50,7 @@ describe('DropdownFieldParser test suite', () => {
   });
 
   it('should throw when authority is not passed', () => {
-    field.selectableMetadata[0].authority = null;
+    field.selectableMetadata[0].controlledVocabulary = null;
     const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(() => parser.parse())
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
index 4816a2a0734..a73e270ed4c 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
@@ -31,8 +31,8 @@ export class DropdownFieldParser extends FieldParser {
     const dropdownModelConfig: DynamicScrollableDropdownModelConfig = this.initModel(null, label);
     let layout: DynamicFormControlLayout;
 
-    if (isNotEmpty(this.configData.selectableMetadata[0].authority)) {
-      this.setAuthorityOptions(dropdownModelConfig, this.parserOptions.authorityUuid);
+    if (isNotEmpty(this.configData.selectableMetadata[0].controlledVocabulary)) {
+      this.setVocabularyOptions(dropdownModelConfig);
       if (isNotEmpty(fieldValue)) {
         dropdownModelConfig.value = fieldValue;
       }
@@ -47,7 +47,7 @@ export class DropdownFieldParser extends FieldParser {
       const dropdownModel = new DynamicScrollableDropdownModel(dropdownModelConfig, layout);
       return dropdownModel;
     } else {
-      throw  Error(`Authority name is not available. Please check the form configuration file.`);
+      throw  Error(`Controlled Vocabulary name is not available. Please check the form configuration file.`);
     }
   }
 }
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index f218d442e1b..c902e455d54 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -1,19 +1,20 @@
 import { Inject, InjectionToken } from '@angular/core';
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined, isEmpty } from '../../../empty.util';
-import { FormFieldModel } from '../models/form-field.model';
 
 import { uniqueId } from 'lodash';
+import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
+
+import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
   DynamicRowArrayModel,
   DynamicRowArrayModelConfig
 } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
 import { setLayout } from './parser.utils';
-import { AuthorityOptions } from '../../../../core/integration/models/authority-options.model';
 import { ParserOptions } from './parser-options';
 import { RelationshipOptions } from '../models/relationship-options.model';
+import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -39,36 +40,51 @@ export abstract class FieldParser {
       && (this.configData.input.type !== 'list')
       && (this.configData.input.type !== 'tag')
       && (this.configData.input.type !== 'group')
-      && isEmpty(this.configData.selectableRelationship)
     ) {
       let arrayCounter = 0;
       let fieldArrayCounter = 0;
 
+      let metadataKey;
+
+      if (Array.isArray(this.configData.selectableMetadata) && this.configData.selectableMetadata.length === 1) {
+        metadataKey = this.configData.selectableMetadata[0].metadata;
+      }
       const config = {
         id: uniqueId() + '_array',
         label: this.configData.label,
         initialCount: this.getInitArrayIndex(),
         notRepeatable: !this.configData.repeatable,
-        required: JSON.parse( this.configData.mandatory),
+        relationshipConfig: this.configData.selectableRelationship,
+        required: JSON.parse(this.configData.mandatory),
+        submissionId: this.submissionId,
+        metadataKey,
+        metadataFields: this.getAllFieldIds(),
+        hasSelectableMetadata: isNotEmpty(this.configData.selectableMetadata),
         groupFactory: () => {
           let model;
           if ((arrayCounter === 0)) {
             model = this.modelFactory();
             arrayCounter++;
           } else {
-            const fieldArrayOfValueLenght = this.getInitValueCount(arrayCounter - 1);
+            const fieldArrayOfValueLength = this.getInitValueCount(arrayCounter - 1);
             let fieldValue = null;
-            if (fieldArrayOfValueLenght > 0) {
-              fieldValue = this.getInitFieldValue(arrayCounter - 1, fieldArrayCounter++);
-              if (fieldArrayCounter === fieldArrayOfValueLenght) {
+            if (fieldArrayOfValueLength > 0) {
+              if (fieldArrayCounter === 0) {
+                fieldValue = '';
+              } else {
+                fieldValue = this.getInitFieldValue(arrayCounter - 1, fieldArrayCounter - 1);
+              }
+              fieldArrayCounter++;
+              if (fieldArrayCounter === fieldArrayOfValueLength + 1) {
                 fieldArrayCounter = 0;
                 arrayCounter++;
               }
             }
             model = this.modelFactory(fieldValue, false);
+            model.id = `${model.id}_${fieldArrayCounter}`;
           }
           setLayout(model, 'element', 'host', 'col');
-          if (model.hasLanguages) {
+          if (model.hasLanguages || isNotEmpty(model.relationship)) {
             setLayout(model, 'grid', 'control', 'col');
           }
           return [model];
@@ -85,6 +101,7 @@ export abstract class FieldParser {
 
     } else {
       const model = this.modelFactory(this.getInitFieldValue());
+      model.submissionId = this.submissionId;
       if (model.hasLanguages || isNotEmpty(model.relationship)) {
         setLayout(model, 'grid', 'control', 'col');
       }
@@ -92,6 +109,52 @@ export abstract class FieldParser {
     }
   }
 
+  public setVocabularyOptions(controlModel) {
+    if (isNotEmpty(this.configData.selectableMetadata) && isNotEmpty(this.configData.selectableMetadata[0].controlledVocabulary)) {
+      controlModel.vocabularyOptions = new VocabularyOptions(
+        this.configData.selectableMetadata[0].controlledVocabulary,
+        this.configData.selectableMetadata[0].closed
+      )
+    }
+  }
+
+  public setValues(modelConfig: DsDynamicInputModelConfig, fieldValue: any, forceValueAsObj: boolean = false, groupModel?: boolean) {
+    if (isNotEmpty(fieldValue)) {
+      if (groupModel) {
+        // Array, values is an array
+        modelConfig.value = this.getInitGroupValues();
+        if (Array.isArray(modelConfig.value) && modelConfig.value.length > 0 && modelConfig.value[0].language) {
+          // Array Item has language, ex. AuthorityModel
+          modelConfig.language = modelConfig.value[0].language;
+        }
+        return;
+      }
+
+      if (typeof fieldValue === 'object') {
+        modelConfig.metadataValue = fieldValue;
+        modelConfig.language = fieldValue.language;
+        modelConfig.place = fieldValue.place;
+        if (forceValueAsObj) {
+          modelConfig.value = fieldValue;
+        } else {
+          modelConfig.value = fieldValue.value;
+        }
+      } else {
+        if (forceValueAsObj) {
+          // If value isn't an instance of FormFieldMetadataValueObject instantiate it
+          modelConfig.value = new FormFieldMetadataValueObject(fieldValue);
+        } else {
+          if (typeof fieldValue === 'string') {
+            // Case only string
+            modelConfig.value = fieldValue;
+          }
+        }
+      }
+    }
+
+    return modelConfig;
+  }
+
   protected getInitValueCount(index = 0, fieldId?): number {
     const fieldIds = fieldId || this.getAllFieldIds();
     if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length === 1 && this.initFormValues.hasOwnProperty(fieldIds[0])) {
@@ -135,8 +198,8 @@ export abstract class FieldParser {
       fieldIds.forEach((id) => {
         if (this.initFormValues.hasOwnProperty(id)) {
           const valueObj: FormFieldMetadataValueObject = Object.assign(new FormFieldMetadataValueObject(), this.initFormValues[id][innerIndex]);
+          // Set metadata name, used for Qualdrop fields
           valueObj.metadata = id;
-          // valueObj.value = this.initFormValues[id][innerIndex];
           values.push(valueObj);
         }
       });
@@ -147,9 +210,10 @@ export abstract class FieldParser {
   }
 
   protected getInitArrayIndex() {
+    let fieldCount = 0;
     const fieldIds: any = this.getAllFieldIds();
     if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length === 1 && this.initFormValues.hasOwnProperty(fieldIds)) {
-      return this.initFormValues[fieldIds].length;
+      fieldCount = this.initFormValues[fieldIds].filter((value) => hasValue(value) && hasValue(value.value)).length;
     } else if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length > 1) {
       let counter = 0;
       fieldIds.forEach((id) => {
@@ -157,10 +221,9 @@ export abstract class FieldParser {
           counter = counter + this.initFormValues[id].length;
         }
       });
-      return (counter === 0) ? 1 : counter;
-    } else {
-      return 1;
+      fieldCount = counter;
     }
+    return (fieldCount === 0) ? 1 : fieldCount + 1
   }
 
   protected getFieldId(): string {
@@ -178,11 +241,11 @@ export abstract class FieldParser {
         return ids;
       }
     } else {
-      return [this.configData.selectableRelationship.relationshipType];
+      return ['relation.' + this.configData.selectableRelationship.relationshipType];
     }
   }
 
-  protected initModel(id?: string, label = true, setErrors = true) {
+  protected initModel(id?: string, label = true, setErrors = true, hint = true) {
 
     const controlModel = Object.create(null);
 
@@ -202,16 +265,17 @@ export abstract class FieldParser {
       controlModel.relationship = Object.assign(new RelationshipOptions(), this.configData.selectableRelationship);
     }
     controlModel.repeatable = this.configData.repeatable;
-    controlModel.metadataFields = isNotEmpty(this.configData.selectableMetadata) ? this.configData.selectableMetadata.map((metadataObject) => metadataObject.metadata) : [];
+    controlModel.metadataFields = this.getAllFieldIds() || [];
+    controlModel.hasSelectableMetadata = isNotEmpty(this.configData.selectableMetadata);
     controlModel.submissionId = this.submissionId;
 
     // Set label
     this.setLabel(controlModel, label);
-
+    if (hint) {
+      controlModel.hint = this.configData.hints;
+    }
     controlModel.placeholder = this.configData.label;
 
-    controlModel.hint = this.configData.hints;
-
     if (this.configData.mandatory && setErrors) {
       this.markAsRequired(controlModel);
     }
@@ -224,14 +288,6 @@ export abstract class FieldParser {
     if (this.configData.languageCodes && this.configData.languageCodes.length > 0) {
       (controlModel as DsDynamicInputModel).languageCodes = this.configData.languageCodes;
     }
-    /*    (controlModel as DsDynamicInputModel).languageCodes = [{
-            display: 'English',
-            code: 'en_US'
-          },
-          {
-            display: 'Italian',
-            code: 'it_IT'
-          }];*/
 
     return controlModel;
   }
@@ -247,7 +303,6 @@ export abstract class FieldParser {
       {},
       controlModel.errorMessages,
       { pattern: 'error.validation.pattern' });
-
   }
 
   protected markAsRequired(controlModel) {
@@ -278,50 +333,4 @@ export abstract class FieldParser {
     }
   }
 
-  public setAuthorityOptions(controlModel, authorityUuid) {
-    if (isNotEmpty(this.configData.selectableMetadata) && isNotEmpty(this.configData.selectableMetadata[0].authority)) {
-      controlModel.authorityOptions = new AuthorityOptions(
-        this.configData.selectableMetadata[0].authority,
-        this.configData.selectableMetadata[0].metadata,
-        authorityUuid,
-        this.configData.selectableMetadata[0].closed
-      )
-    }
-  }
-
-  public setValues(modelConfig: DsDynamicInputModelConfig, fieldValue: any, forceValueAsObj: boolean = false, groupModel?: boolean) {
-    if (isNotEmpty(fieldValue)) {
-      if (groupModel) {
-        // Array, values is an array
-        modelConfig.value = this.getInitGroupValues();
-        if (Array.isArray(modelConfig.value) && modelConfig.value.length > 0 && modelConfig.value[0].language) {
-          // Array Item has language, ex. AuthorityModel
-          modelConfig.language = modelConfig.value[0].language;
-        }
-        return;
-      }
-
-      if (typeof fieldValue === 'object') {
-        modelConfig.language = fieldValue.language;
-        if (forceValueAsObj) {
-          modelConfig.value = fieldValue;
-        } else {
-          modelConfig.value = fieldValue.value;
-        }
-      } else {
-        if (forceValueAsObj) {
-          // If value isn't an instance of FormFieldMetadataValueObject instantiate it
-          modelConfig.value = new FormFieldMetadataValueObject(fieldValue);
-        } else {
-          if (typeof fieldValue === 'string') {
-            // Case only string
-            modelConfig.value = fieldValue;
-          }
-        }
-      }
-    }
-
-    return modelConfig;
-  }
-
 }
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
index fab5ec38880..8a05b169fd3 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
@@ -13,7 +13,7 @@ describe('ListFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -28,7 +28,7 @@ describe('ListFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'type',
-          authority: 'type_programme',
+          controlledVocabulary: 'type_programme',
           closed: false
         }
       ],
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.ts b/src/app/shared/form/builder/parsers/list-field-parser.ts
index 273c9d16651..48211b0aff6 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.ts
@@ -1,19 +1,17 @@
 import { FieldParser } from './field-parser';
 import { isNotEmpty } from '../../../empty.util';
-import { IntegrationSearchOptions } from '../../../../core/integration/models/integration-options.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DynamicListCheckboxGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
 
 export class ListFieldParser extends FieldParser {
-  searchOptions: IntegrationSearchOptions;
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
     const listModelConfig = this.initModel(null, label);
     listModelConfig.repeatable = this.configData.repeatable;
 
-    if (this.configData.selectableMetadata[0].authority
-      && this.configData.selectableMetadata[0].authority.length > 0) {
+    if (this.configData.selectableMetadata[0].controlledVocabulary
+      && this.configData.selectableMetadata[0].controlledVocabulary.length > 0) {
 
       if (isNotEmpty(this.getInitGroupValues())) {
         listModelConfig.value = [];
@@ -26,7 +24,7 @@ export class ListFieldParser extends FieldParser {
           }
         });
       }
-      this.setAuthorityOptions(listModelConfig, this.parserOptions.authorityUuid);
+      this.setVocabularyOptions(listModelConfig);
     }
 
     let listModel;
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
index 5e14e0c013c..87cee9d950d 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('LookupFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -27,7 +27,7 @@ describe('LookupFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'journal',
-          authority: 'JOURNALAuthority',
+          controlledVocabulary: 'JOURNALAuthority',
           closed: false
         }
       ],
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.ts
index 9e9c434c4fa..2c35d2ceb81 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.ts
@@ -5,10 +5,10 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 export class LookupFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
-    if (this.configData.selectableMetadata[0].authority) {
+    if (this.configData.selectableMetadata[0].controlledVocabulary) {
       const lookupModelConfig: DynamicLookupModelConfig = this.initModel(null, label);
 
-      this.setAuthorityOptions(lookupModelConfig, this.parserOptions.authorityUuid);
+      this.setVocabularyOptions(lookupModelConfig);
 
       this.setValues(lookupModelConfig, fieldValue, true);
 
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
index adc1e901667..3d02b6952ef 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('LookupNameFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -27,7 +27,7 @@ describe('LookupNameFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'author',
-          authority: 'RPAuthority',
+          controlledVocabulary: 'RPAuthority',
           closed: false
         }
       ],
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
index 684e06bcb68..c791e07e74f 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
@@ -8,10 +8,10 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 export class LookupNameFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
-    if (this.configData.selectableMetadata[0].authority) {
+    if (this.configData.selectableMetadata[0].controlledVocabulary) {
       const lookupModelConfig: DynamicLookupNameModelConfig = this.initModel(null, label);
 
-      this.setAuthorityOptions(lookupModelConfig, this.parserOptions.authorityUuid);
+      this.setVocabularyOptions(lookupModelConfig);
 
       this.setValues(lookupModelConfig, fieldValue, true);
 
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
index 1b0c6370304..8342b1fc7ec 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
@@ -14,7 +14,7 @@ describe('NameFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -95,7 +95,7 @@ describe('NameFieldParser test suite', () => {
     initFormValues = {
       name: [new FormFieldMetadataValueObject('test, name')],
     };
-    const expectedValue = new FormFieldMetadataValueObject('test, name');
+    const expectedValue = new FormFieldMetadataValueObject('test, name', undefined, undefined, 'test');
 
     const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions);
 
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
index 4668b3017d8..e6a99d8e740 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
@@ -1,7 +1,7 @@
 import { FormFieldModel } from '../models/form-field.model';
 import { OneboxFieldParser } from './onebox-field-parser';
 import { DynamicQualdropModel } from '../ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { DynamicTypeaheadModel } from '../ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.model';
+import { DynamicOneboxModel } from '../ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
 import { DsDynamicInputModel } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { ParserOptions } from './parser-options';
 
@@ -15,7 +15,7 @@ describe('OneboxFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -28,7 +28,7 @@ describe('OneboxFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'title',
-          authority: 'EVENTAuthority',
+          controlledVocabulary: 'EVENTAuthority',
           closed: false
         }
       ],
@@ -92,12 +92,12 @@ describe('OneboxFieldParser test suite', () => {
     expect(fieldModel instanceof DsDynamicInputModel).toBe(true);
   });
 
-  it('should return a DynamicTypeaheadModel object when selectableMetadata has authority', () => {
+  it('should return a DynamicOneboxModel object when selectableMetadata has authority', () => {
     const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
-    expect(fieldModel instanceof DynamicTypeaheadModel).toBe(true);
+    expect(fieldModel instanceof DynamicOneboxModel).toBe(true);
   });
 
 });
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
index d69c9d4677a..b9ac531c68f 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
@@ -12,9 +12,9 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { isNotEmpty } from '../../../empty.util';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import {
-  DsDynamicTypeaheadModelConfig,
-  DynamicTypeaheadModel
-} from '../ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.model';
+  DsDynamicOneboxModelConfig,
+  DynamicOneboxModel
+} from '../ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
 
 export class OneboxFieldParser extends FieldParser {
 
@@ -75,12 +75,12 @@ export class OneboxFieldParser extends FieldParser {
       inputSelectGroup.group.push(new DsDynamicInputModel(inputModelConfig, clsInput));
 
       return new DynamicQualdropModel(inputSelectGroup, clsGroup);
-    } else if (this.configData.selectableMetadata[0].authority) {
-      const typeaheadModelConfig: DsDynamicTypeaheadModelConfig = this.initModel(null, label);
-      this.setAuthorityOptions(typeaheadModelConfig, this.parserOptions.authorityUuid);
-      this.setValues(typeaheadModelConfig, fieldValue, true);
+    } else if (this.configData.selectableMetadata[0].controlledVocabulary) {
+      const oneboxModelConfig: DsDynamicOneboxModelConfig = this.initModel(null, label);
+      this.setVocabularyOptions(oneboxModelConfig);
+      this.setValues(oneboxModelConfig, fieldValue, true);
 
-      return new DynamicTypeaheadModel(typeaheadModelConfig);
+      return new DynamicOneboxModel(oneboxModelConfig);
     } else {
       const inputModelConfig: DsDynamicInputModelConfig = this.initModel(null, label);
       this.setValues(inputModelConfig, fieldValue);
diff --git a/src/app/shared/form/builder/parsers/parser-options.ts b/src/app/shared/form/builder/parsers/parser-options.ts
index f96ce0f2f37..e8ac4b49cd6 100644
--- a/src/app/shared/form/builder/parsers/parser-options.ts
+++ b/src/app/shared/form/builder/parsers/parser-options.ts
@@ -1,5 +1,5 @@
 export interface ParserOptions {
   readOnly: boolean;
   submissionScope: string;
-  authorityUuid: string
+  collectionUUID: string
 }
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
index 84f3df0365c..111193a6375 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('RelationGroupFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: 'WORKSPACE'
+    collectionUUID: 'WORKSPACE'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
index 01699d9e784..28242e3c3cb 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
@@ -5,10 +5,10 @@ import { FormFieldModel } from '../models/form-field.model';
 import { isNotEmpty } from '../../../empty.util';
 import {
   DynamicRelationGroupModel,
-  DynamicRelationGroupModelConfig,
-  PLACEHOLDER_PARENT_METADATA
+  DynamicRelationGroupModelConfig
 } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
+import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export class RelationGroupFieldParser extends FieldParser {
 
@@ -16,7 +16,7 @@ export class RelationGroupFieldParser extends FieldParser {
     const modelConfiguration: DynamicRelationGroupModelConfig = this.initModel(null, label);
 
     modelConfiguration.submissionId = this.submissionId;
-    modelConfiguration.scopeUUID = this.parserOptions.authorityUuid;
+    modelConfiguration.scopeUUID = this.parserOptions.collectionUUID;
     modelConfiguration.submissionScope = this.parserOptions.submissionScope;
     if (this.configData && this.configData.rows && this.configData.rows.length > 0) {
       modelConfiguration.formConfiguration = this.configData.rows;
diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts
index 435c6a64263..63f343e60d0 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -35,7 +35,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'journal',
-              authority: 'JOURNALAuthority',
+              controlledVocabulary: 'JOURNALAuthority',
               closed: false
             }
           ],
@@ -83,7 +83,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'title',
-              authority: 'EVENTAuthority',
+              controlledVocabulary: 'EVENTAuthority',
               closed: false
             }
           ],
@@ -103,7 +103,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'title',
-              authority: 'EVENTAuthority',
+              controlledVocabulary: 'EVENTAuthority',
               closed: false
             }
           ],
@@ -119,7 +119,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'otherTitle',
-              authority: 'EVENTAuthority',
+              controlledVocabulary: 'EVENTAuthority',
               closed: false
             }
           ],
@@ -141,7 +141,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'type',
-              authority: 'common_types_dataset',
+              controlledVocabulary: 'common_types_dataset',
               closed: false
             }
           ],
@@ -176,7 +176,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'author',
-              authority: 'RPAuthority',
+              controlledVocabulary: 'RPAuthority',
               closed: false
             }
           ],
@@ -198,7 +198,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'type',
-              authority: 'type_programme',
+              controlledVocabulary: 'type_programme',
               closed: false
             }
           ],
@@ -241,7 +241,7 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'subject',
-              authority: 'JOURNALAuthority',
+              controlledVocabulary: 'JOURNALAuthority',
               closed: false
             }
           ],
diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts
index 4938b9859ec..a9acb3184c9 100644
--- a/src/app/shared/form/builder/parsers/row-parser.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.ts
@@ -1,26 +1,17 @@
 import { Injectable, Injector } from '@angular/core';
-import {
-  DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
-  DynamicFormGroupModelConfig
-} from '@ng-dynamic-forms/core';
+
+import { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DynamicFormGroupModelConfig } from '@ng-dynamic-forms/core';
 import { uniqueId } from 'lodash';
 
-import { IntegrationSearchOptions } from '../../../../core/integration/models/integration-options.model';
 import { isEmpty } from '../../../empty.util';
 import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormFieldModel } from '../models/form-field.model';
-import {
-  CONFIG_DATA,
-  FieldParser,
-  INIT_FORM_VALUES,
-  PARSER_OPTIONS,
-  SUBMISSION_ID
-} from './field-parser';
+import { CONFIG_DATA, FieldParser, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
 import { ParserFactory } from './parser-factory';
 import { ParserOptions } from './parser-options';
 import { ParserType } from './parser-type';
 import { setLayout } from './parser.utils';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export const ROW_ID_PREFIX = 'df-row-group-config-';
 
@@ -48,8 +39,6 @@ export class RowParser {
       group: [],
     };
 
-    const authorityOptions = new IntegrationSearchOptions(scopeUUID);
-
     const scopedFields: FormFieldModel[] = this.filterScopedFields(rowData.fields, submissionScope);
 
     const layoutDefaultGridClass = ' col-sm-' + Math.trunc(12 / scopedFields.length);
@@ -58,7 +47,7 @@ export class RowParser {
     const parserOptions: ParserOptions = {
       readOnly: readOnly,
       submissionScope: submissionScope,
-      authorityUuid: authorityOptions.uuid
+      collectionUUID: scopeUUID
     };
 
     // Iterate over row's fields
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
index ceb4e963206..229ca989d3d 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('SeriesFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -58,7 +58,7 @@ describe('SeriesFieldParser test suite', () => {
     initFormValues = {
       series: [new FormFieldMetadataValueObject('test; series')],
     };
-    const expectedValue = new FormFieldMetadataValueObject('test; series');
+    const expectedValue = new FormFieldMetadataValueObject('test; series', undefined, undefined, 'test');
 
     const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
 
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
index 90449e62e5d..7c63235f678 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('TagFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
@@ -27,7 +27,7 @@ describe('TagFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'subject',
-          authority: 'JOURNALAuthority',
+          controlledVocabulary: 'JOURNALAuthority',
           closed: false
         }
       ],
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.ts b/src/app/shared/form/builder/parsers/tag-field-parser.ts
index c1c39feb2bc..dcc2c5575f6 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.ts
@@ -6,9 +6,9 @@ export class TagFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
     const tagModelConfig: DynamicTagModelConfig = this.initModel(null, label);
-    if (this.configData.selectableMetadata[0].authority
-      && this.configData.selectableMetadata[0].authority.length > 0) {
-      this.setAuthorityOptions(tagModelConfig, this.parserOptions.authorityUuid);
+    if (this.configData.selectableMetadata[0].controlledVocabulary
+      && this.configData.selectableMetadata[0].controlledVocabulary.length > 0) {
+      this.setVocabularyOptions(tagModelConfig);
     }
 
     this.setValues(tagModelConfig, fieldValue, null, true);
diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
index 167f126cf22..84acc9f239a 100644
--- a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
@@ -12,7 +12,7 @@ describe('TextareaFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
-    authorityUuid: null
+    collectionUUID: null
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/form.actions.ts b/src/app/shared/form/form.actions.ts
index 3eb3fb2716a..5733cb90bcf 100644
--- a/src/app/shared/form/form.actions.ts
+++ b/src/app/shared/form/form.actions.ts
@@ -13,6 +13,7 @@ import { type } from '../ngrx/type';
 export const FormActionTypes = {
   FORM_INIT: type('dspace/form/FORM_INIT'),
   FORM_CHANGE: type('dspace/form/FORM_CHANGE'),
+  FORM_ADD_TOUCHED: type('dspace/form/FORM_ADD_TOUCHED'),
   FORM_REMOVE: type('dspace/form/FORM_REMOVE'),
   FORM_STATUS_CHANGE: type('dspace/form/FORM_STATUS_CHANGE'),
   FORM_ADD_ERROR: type('dspace/form/FORM_ADD_ERROR'),
@@ -52,7 +53,7 @@ export class FormChangeAction implements Action {
   };
 
   /**
-   * Create a new FormInitAction
+   * Create a new FormChangeAction
    *
    * @param formId
    *    the Form's ID
@@ -64,6 +65,26 @@ export class FormChangeAction implements Action {
   }
 }
 
+export class FormAddTouchedAction implements Action {
+  type = FormActionTypes.FORM_ADD_TOUCHED;
+  payload: {
+    formId: string;
+    touched: string[];
+  };
+
+  /**
+   * Create a new FormAddTouchedAction
+   *
+   * @param formId
+   *    the Form's ID
+   * @param touched
+   *    the array containing new touched fields
+   */
+  constructor(formId: string, touched: string[]) {
+    this.payload = {formId, touched};
+  }
+}
+
 export class FormRemoveAction implements Action {
   type = FormActionTypes.FORM_REMOVE;
   payload: {
@@ -147,6 +168,7 @@ export class FormClearErrorsAction implements Action {
  */
 export type FormAction = FormInitAction
   | FormChangeAction
+  | FormAddTouchedAction
   | FormRemoveAction
   | FormStatusChangeAction
   | FormAddError
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 20fb942380d..97879cc0250 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -1,65 +1,57 @@
 <div class="container-fluid">
-  <form class="form-horizontal" [formGroup]="formGroup">
-
-    <ds-dynamic-form
-      [formId]="formId"
-      [formGroup]="formGroup"
-      [formModel]="formModel"
-      [formLayout]="formLayout"
-      (change)="$event.stopPropagation();"
-      (dfBlur)="onBlur($event)"
-      (dfChange)="onChange($event)"
-      (dfFocus)="onFocus($event)">
-
-      <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
-
-        <!--Array with repeatable items-->
-        <div *ngIf="!context.notRepeatable"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Add and remove button">
-            <button type="button" class="btn btn-secondary"
-                    [disabled]="isItemReadOnly(context, index)"
-                    (click)="insertItem($event, group.context, group.index + 1)">
-              <i class="fas fa-plus" aria-hidden="true"></i>
-            </button>
-            <button type="button" class="btn btn-secondary"
-                    (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
-              <i class="fas fa-trash" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-
-        <!--Array with non repeatable items - Only delete button-->
-        <div *ngIf="context.notRepeatable && group.context.groups.length > 1"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Remove button">
-            <button type="button" class="btn btn-secondary"
-                    (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
-              <i class="fas fa-trash" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-      </ng-template>
-
-    </ds-dynamic-form>
-
-    <ng-content></ng-content>
+    <form class="form-horizontal" [formGroup]="formGroup">
+
+        <ds-dynamic-form
+                [formId]="formId"
+                [formGroup]="formGroup"
+                [formModel]="formModel"
+                [formLayout]="formLayout"
+                (change)="$event.stopPropagation();"
+                (dfBlur)="onBlur($event)"
+                (dfChange)="onChange($event)"
+                (dfFocus)="onFocus($event)">
+            <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
+                <!--Array with repeatable items-->
+                <div *ngIf="context.hasSelectableMetadata && !context.notRepeatable && index < 1"
+                     class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+                    <div class="btn-group" role="group" aria-label="Add and remove button">
+                        <button type="button" class="btn btn-secondary"
+                                [disabled]="isItemReadOnly(context, index)"
+                                (click)="insertItem($event, group.context, group.index)">
+                            <span aria-label="Add">{{'form.add' | translate}}</span>
+                        </button>
+                    </div>
+                </div>
+
+                <!--Array with non repeatable items - Only delete button-->
+                <div *ngIf="context.notRepeatable && group.context.groups.length > 1 || index > 0 && !(group.group[0]?.value?.isVirtual || group.group[0]?.metadataValue?.isVirtual)"
+                     class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+                    <div class="btn-group" role="group" aria-label="Remove button">
+                        <button type="button" class="btn btn-secondary"
+                                (click)="removeItem($event, context, index)"
+                                [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                            <i class="fas fa-trash" aria-hidden="true"></i>
+                        </button>
+                    </div>
+                </div>
+            </ng-template>
+
+        </ds-dynamic-form>
+
+        <ng-content></ng-content>
 
     <div *ngIf="displaySubmit">
-      <hr>
-      <div class="form-group row">
-
-        <div class="col text-right">
-          <button type="reset" class="btn btn-default" (click)="reset()">{{cancelLabel | translate}}</button>
-          <button type="submit" class="btn btn-primary" (click)="onSubmit()"
-                  [disabled]="!(isValid() | async)">{{submitLabel | translate}}
-          </button>
+            <hr>
+            <div class="form-group row">
+                <div class="col text-right">
+                    <button type="reset" class="btn btn-default" (click)="reset()">{{cancelLabel | translate}}</button>
+                    <button type="submit" class="btn btn-primary" (click)="onSubmit()"
+                            [disabled]="!(isValid() | async)">{{submitLabel | translate}}
+                    </button>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
 
-  </form>
+    </form>
 
 </div>
diff --git a/src/app/shared/form/form.component.scss b/src/app/shared/form/form.component.scss
index acdeb792ca4..01cf09576fd 100644
--- a/src/app/shared/form/form.component.scss
+++ b/src/app/shared/form/form.component.scss
@@ -42,8 +42,3 @@
 .right-addon input {
   padding-right: $spacer * 2.25;
 }
-
-.ds-form-qualdrop-hint {
-  top: -$spacer;
-  position: relative;
-}
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 6a8a1229d46..bda2b3e38c2 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -92,7 +92,6 @@ function init() {
       groupFactory: () => {
         return [
           new DynamicInputModel({
-
             id: 'bootstrapArrayGroupInput',
             placeholder: 'example array group input',
             readOnly: false
@@ -120,7 +119,8 @@ function init() {
         dc_identifier_issn: null
       },
       valid: false,
-      errors: []
+      errors: [],
+      touched: {}
     }
   };
 
@@ -362,7 +362,7 @@ describe('FormComponent test suite', () => {
 
       spyOn((formComp as any).formService, 'validateAllFormFields');
 
-      form.next(formState.testForm)
+      form.next(formState.testForm);
       formFixture.detectChanges();
 
       formComp.onSubmit();
@@ -418,7 +418,7 @@ describe('FormComponent test suite', () => {
     }));
 
     it('should dispatch FormChangeAction when an item has been removed from an array', inject([FormBuilderService], (service: FormBuilderService) => {
-      formComp.removeItem(new Event('click'), formComp.formModel[0] as DynamicFormArrayModel, 0);
+      formComp.removeItem(new Event('click'), formComp.formModel[0] as DynamicFormArrayModel, 1);
 
       expect(store.dispatch).toHaveBeenCalledWith(new FormChangeAction('testFormArray', service.getValueFromModel(formComp.formModel)));
     }));
@@ -426,7 +426,7 @@ describe('FormComponent test suite', () => {
     it('should emit removeArrayItem Event when an item has been removed from an array', inject([FormBuilderService], (service: FormBuilderService) => {
       spyOn(formComp.removeArrayItem, 'emit');
 
-      formComp.removeItem(new Event('click'), formComp.formModel[0] as DynamicFormArrayModel, 0);
+      formComp.removeItem(new Event('click'), formComp.formModel[0] as DynamicFormArrayModel, 1);
 
       expect(formComp.removeArrayItem.emit).toHaveBeenCalled();
     }));
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index def61cb5b29..43f9bdfa901 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -1,13 +1,5 @@
 import { distinctUntilChanged, filter, map } from 'rxjs/operators';
-import {
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output, ViewEncapsulation
-} from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
 
 import {
@@ -23,6 +15,9 @@ import { Observable, Subscription } from 'rxjs';
 import { hasValue, isNotEmpty, isNotNull, isNull } from '../empty.util';
 import { FormService } from './form.service';
 import { FormEntry, FormError } from './form.reducer';
+import { QUALDROP_GROUP_SUFFIX } from './builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
+
+const QUALDROP_GROUP_REGEX = new RegExp(`${QUALDROP_GROUP_SUFFIX}_\\d+$`);
 
 /**
  * The default form component.
@@ -160,8 +155,8 @@ export class FormComponent implements OnDestroy, OnInit {
     this.formValid = this.getFormGroupValidStatus();
 
     this.subs.push(this.formGroup.statusChanges.pipe(
-      filter((currentStatus) => this.formValid !== this.getFormGroupValidStatus()))
-      .subscribe((currentStatus) => {
+      filter(() => this.formValid !== this.getFormGroupValidStatus()))
+      .subscribe(() => {
         this.formService.setStatusChanged(this.formId, this.getFormGroupValidStatus());
         this.formValid = this.getFormGroupValidStatus();
       }));
@@ -258,6 +253,7 @@ export class FormComponent implements OnDestroy, OnInit {
   }
 
   onFocus(event: DynamicFormControlEvent): void {
+    this.formService.setTouched(this.formId, this.formModel, event);
     this.focus.emit(event);
   }
 
@@ -304,15 +300,55 @@ export class FormComponent implements OnDestroy, OnInit {
 
   removeItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
     const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as FormArray;
-    this.removeArrayItem.emit(this.getEvent($event, arrayContext, index, 'remove'));
+    this.removeArrayItem.emit(this.getEvent($event, arrayContext, index - 1, 'remove'));
     this.formBuilderService.removeFormArrayGroup(index, formArrayControl, arrayContext);
     this.formService.changeForm(this.formId, this.formModel);
   }
 
   insertItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
     const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as FormArray;
-    this.formBuilderService.insertFormArrayGroup(index, formArrayControl, arrayContext);
-    this.addArrayItem.emit(this.getEvent($event, arrayContext, index, 'add'));
+
+    // First emit the new value so it can be sent to the server
+    const value = formArrayControl.controls[0].value;
+    const event = this.getEvent($event, arrayContext, 0, 'add');
+    this.addArrayItem.emit(event);
+    this.change.emit(event);
+
+    // Next: update the UI so the user sees the changes
+    // without having to wait for the server's reply
+
+    // add an empty new field at the bottom
+    this.formBuilderService.addFormArrayGroup(formArrayControl, arrayContext);
+
+    // set that field to the new value
+    const model = arrayContext.groups[arrayContext.groups.length - 1].group[0] as any;
+    if (model.hasAuthority) {
+      model.value = Object.values(value)[0];
+      const ctrl = formArrayControl.controls[formArrayControl.length - 1];
+      const ctrlValue = ctrl.value;
+      const ctrlValueKey = Object.keys(ctrlValue)[0];
+      ctrl.setValue({
+        [ctrlValueKey]: model.value
+      });
+    } else if (this.formBuilderService.isQualdropGroup(model)) {
+      const ctrl = formArrayControl.controls[formArrayControl.length - 1];
+      const ctrlKey = Object.keys(ctrl.value).find((key: string) => isNotEmpty(key.match(QUALDROP_GROUP_REGEX)));
+      const valueKey = Object.keys(value).find((key: string) => isNotEmpty(key.match(QUALDROP_GROUP_REGEX)));
+      if (ctrlKey !== valueKey) {
+        Object.defineProperty(value, ctrlKey, Object.getOwnPropertyDescriptor(value, valueKey));
+        delete value[valueKey];
+      }
+      ctrl.setValue(value);
+    } else {
+      formArrayControl.controls[formArrayControl.length - 1].setValue(value);
+    }
+
+    // Clear the topmost field by removing the filled out version and inserting a new, empty version.
+    // Doing it this way ensures an empty value of the correct type is added without a bunch of ifs here
+    this.formBuilderService.removeFormArrayGroup(0, formArrayControl, arrayContext);
+    this.formBuilderService.insertFormArrayGroup(0, formArrayControl, arrayContext);
+
+    // Tell the formService that it should rerender.
     this.formService.changeForm(this.formId, this.formModel);
   }
 
diff --git a/src/app/shared/form/form.reducer.spec.ts b/src/app/shared/form/form.reducer.spec.ts
index 01e3e6b1bad..5547eee7a41 100644
--- a/src/app/shared/form/form.reducer.spec.ts
+++ b/src/app/shared/form/form.reducer.spec.ts
@@ -6,6 +6,7 @@ import {
   FormInitAction,
   FormRemoveAction,
   FormRemoveErrorAction,
+  FormAddTouchedAction,
   FormStatusChangeAction
 } from './form.actions';
 
@@ -21,7 +22,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: false,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
     const formId = 'testForm';
@@ -48,7 +50,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: false,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
     const formId = 'testForm';
@@ -67,7 +70,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: false,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
 
@@ -88,7 +92,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: false,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
     const state = {
@@ -100,7 +105,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: false,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
     const formId = 'testForm';
@@ -127,7 +133,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: false,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
     const state = {
@@ -139,7 +146,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: true,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
     const formId = 'testForm';
@@ -160,7 +168,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: true,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
 
@@ -204,7 +213,8 @@ describe('formReducer', () => {
             fieldIndex: 0,
             message: 'error.validation.required'
           }
-        ]
+        ],
+        touched: {}
       }
     };
 
@@ -236,7 +246,8 @@ describe('formReducer', () => {
           description: null
         },
         valid: true,
-        errors: []
+        errors: [],
+        touched: {}
       }
     };
 
@@ -264,7 +275,8 @@ describe('formReducer', () => {
             fieldIndex: 0,
             message: 'error.validation.required'
           }
-        ]
+        ],
+        touched: {}
       }
     };
 
@@ -275,4 +287,84 @@ describe('formReducer', () => {
 
     expect(newState.testForm.errors).toEqual([]);
   });
+
+  it('should set new touched field to the form state', () => {
+    const initState = {
+      testForm: {
+        data: {
+          author: null,
+          title: ['test'],
+          date: null,
+          description: null
+        },
+        valid: false,
+        errors: [],
+        touched: {}
+      }
+    };
+    const state = {
+      testForm: {
+        data: {
+          author: null,
+          title: ['test'],
+          date: null,
+          description: null
+        },
+        valid: false,
+        errors: [],
+        touched: {
+          title: true
+        }
+      }
+    };
+    const formId = 'testForm';
+    const touched = ['title'];
+
+    const action = new FormAddTouchedAction(formId, touched);
+    const newState = formReducer(initState, action);
+
+    expect(newState).toEqual(state);
+  });
+
+  it('should add new touched field to the form state', () => {
+    const initState = {
+      testForm: {
+        data: {
+          author: null,
+          title: ['test'],
+          date: null,
+          description: null
+        },
+        valid: false,
+        errors: [],
+        touched: {
+          title: true
+        }
+      }
+    };
+    const state = {
+      testForm: {
+        data: {
+          author: null,
+          title: ['test'],
+          date: null,
+          description: null
+        },
+        valid: false,
+        errors: [],
+        touched: {
+          title: true,
+          author: true
+        }
+      }
+    };
+    const formId = 'testForm';
+    const touched = ['author'];
+
+    const action = new FormAddTouchedAction(formId, touched);
+    const newState = formReducer(initState, action);
+
+    expect(newState).toEqual(state);
+  });
+
 });
diff --git a/src/app/shared/form/form.reducer.ts b/src/app/shared/form/form.reducer.ts
index 1d44375c0d3..59b942ebc32 100644
--- a/src/app/shared/form/form.reducer.ts
+++ b/src/app/shared/form/form.reducer.ts
@@ -4,9 +4,8 @@ import {
   FormAddError,
   FormChangeAction, FormClearErrorsAction,
   FormInitAction,
-  FormRemoveAction,
-  FormRemoveErrorAction,
-  FormStatusChangeAction
+  FormRemoveAction, FormRemoveErrorAction,
+  FormStatusChangeAction, FormAddTouchedAction
 } from './form.actions';
 import { hasValue } from '../empty.util';
 import { isEqual, uniqWith } from 'lodash';
@@ -17,10 +16,15 @@ export interface FormError {
   fieldIndex: number;
 }
 
+export interface FormTouchedState {
+  [key: string]: boolean
+}
+
 export interface FormEntry {
   data: any;
   valid: boolean;
   errors: FormError[];
+  touched: FormTouchedState;
 }
 
 export interface FormState {
@@ -40,6 +44,10 @@ export function formReducer(state = initialState, action: FormAction): FormState
       return changeDataForm(state, action as FormChangeAction);
     }
 
+    case FormActionTypes.FORM_ADD_TOUCHED: {
+      return changeTouchedState(state, action as FormAddTouchedAction);
+    }
+
     case FormActionTypes.FORM_REMOVE: {
       return removeForm(state, action as FormRemoveAction);
     }
@@ -127,7 +135,8 @@ function initForm(state: FormState, action: FormInitAction): FormState {
   const formState = {
     data: action.payload.formData,
     valid: action.payload.valid,
-    errors: []
+    touched: {},
+    errors: [],
   };
   if (!hasValue(state[action.payload.formId])) {
     return Object.assign({}, state, {
@@ -212,3 +221,24 @@ function removeForm(state: FormState, action: FormRemoveAction): FormState {
     return state;
   }
 }
+
+/**
+ * Compute the touched state of the form. New touched fields are merged with the previous ones.
+ * @param state
+ * @param action
+ */
+function changeTouchedState(state: FormState, action: FormAddTouchedAction): FormState {
+  if (hasValue(state[action.payload.formId])) {
+    const newState = Object.assign({}, state);
+
+    const newForm = Object.assign({}, newState[action.payload.formId]);
+    newState[action.payload.formId] = newForm;
+
+    newForm.touched = { ... newForm.touched};
+    action.payload.touched.forEach((field) => newForm.touched[field] = true);
+
+    return newState;
+  } else {
+    return state;
+  }
+}
diff --git a/src/app/shared/form/form.service.spec.ts b/src/app/shared/form/form.service.spec.ts
index ee90e377ee9..a0f7f9980b8 100644
--- a/src/app/shared/form/form.service.spec.ts
+++ b/src/app/shared/form/form.service.spec.ts
@@ -84,7 +84,8 @@ describe('FormService test suite', () => {
     testForm: {
       data: formData,
       valid: false,
-      errors: []
+      errors: [],
+      touched: {}
     }
   };
 
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index 2b0815a40e1..b895a188a4a 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -1,5 +1,5 @@
 import { map, distinctUntilChanged, filter } from 'rxjs/operators';
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { select, Store } from '@ngrx/store';
@@ -7,16 +7,16 @@ import { select, Store } from '@ngrx/store';
 import { AppState } from '../../app.reducer';
 import { formObjectFromIdSelector } from './selectors';
 import { FormBuilderService } from './builder/form-builder.service';
-import { DynamicFormControlModel } from '@ng-dynamic-forms/core';
+import { DynamicFormControlEvent, DynamicFormControlModel } from '@ng-dynamic-forms/core';
 import { isEmpty, isNotUndefined } from '../empty.util';
 import { uniqueId } from 'lodash';
 import {
   FormChangeAction,
   FormInitAction,
-  FormRemoveAction, FormRemoveErrorAction,
+  FormRemoveAction, FormRemoveErrorAction, FormAddTouchedAction,
   FormStatusChangeAction
 } from './form.actions';
-import { FormEntry } from './form.reducer';
+import { FormEntry, FormTouchedState } from './form.reducer';
 import { environment } from '../../../environments/environment';
 
 @Injectable()
@@ -51,6 +51,18 @@ export class FormService {
     );
   }
 
+  /**
+   * Method to retrieve form's touched state
+   */
+  public getFormTouchedState(formId: string): Observable<FormTouchedState> {
+    return this.store.pipe(
+      select(formObjectFromIdSelector(formId)),
+      filter((state) => isNotUndefined(state)),
+      map((state) => state.touched),
+      distinctUntilChanged()
+    );
+  }
+
   /**
    * Method to retrieve form's errors from state
    */
@@ -169,6 +181,11 @@ export class FormService {
     this.store.dispatch(new FormChangeAction(formId, this.formBuilderService.getValueFromModel(model)));
   }
 
+  public setTouched(formId: string, model: DynamicFormControlModel[], event: DynamicFormControlEvent) {
+    const ids = this.formBuilderService.getMetadataIdsFromEvent(event);
+    this.store.dispatch(new FormAddTouchedAction(formId, ids));
+  }
+
   public removeError(formId: string, eventModelId: string, fieldIndex: number) {
     this.store.dispatch(new FormRemoveErrorAction(formId, eventModelId, fieldIndex));
   }
diff --git a/src/app/shared/hover-class.directive.spec.ts b/src/app/shared/hover-class.directive.spec.ts
new file mode 100644
index 00000000000..9c593f27c88
--- /dev/null
+++ b/src/app/shared/hover-class.directive.spec.ts
@@ -0,0 +1,35 @@
+import { Component, DebugElement } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HoverClassDirective } from './hover-class.directive';
+import { By } from '@angular/platform-browser';
+
+@Component({
+  template: `<div dsHoverClass="ds-hover"></div>`
+})
+class TestComponent { }
+
+describe('HoverClassDirective', () => {
+  let component: TestComponent;
+  let fixture: ComponentFixture<TestComponent>;
+  let el: DebugElement;
+
+  beforeEach(() => {
+    fixture = TestBed.configureTestingModule({
+      declarations: [TestComponent, HoverClassDirective]
+    }).createComponent(TestComponent);
+
+    fixture.detectChanges();
+    component = fixture.componentInstance;
+    el = fixture.debugElement.query(By.css('div'));
+  });
+
+  it('should add the class on mouseenter and remove on mouseleave', () => {
+    el.triggerEventHandler('mouseenter', null);
+    fixture.detectChanges();
+    expect(el.nativeElement.classList).toContain('ds-hover');
+
+    el.triggerEventHandler('mouseleave', null);
+    fixture.detectChanges();
+    expect(el.nativeElement.classList).not.toContain('ds-hover');
+  });
+});
diff --git a/src/app/shared/hover-class.directive.ts b/src/app/shared/hover-class.directive.ts
new file mode 100644
index 00000000000..551e81a4638
--- /dev/null
+++ b/src/app/shared/hover-class.directive.ts
@@ -0,0 +1,31 @@
+import { Directive, ElementRef, HostListener, Input } from '@angular/core';
+
+@Directive({
+  selector: '[dsHoverClass]'
+})
+/**
+ * A directive adding a class to an element when hovered over
+ */
+export class HoverClassDirective {
+  /**
+   * The name of the class to add on hover
+   */
+  @Input('dsHoverClass') hoverClass: string;
+​
+  constructor(public elementRef: ElementRef) { }
+​
+  /**
+   * On mouse enter, add the class to the element's class list
+   */
+  @HostListener('mouseenter') onMouseEnter() {
+    this.elementRef.nativeElement.classList.add(this.hoverClass);
+  }
+​
+  /**
+   * On mouse leave, remove the class from the element's class list
+   */
+  @HostListener('mouseleave') onMouseLeave() {
+    this.elementRef.nativeElement.classList.remove(this.hoverClass);
+  }
+​
+}
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
index e6ddc3075d8..8e36b2ccb73 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
@@ -26,6 +26,7 @@ describe('ImpersonateNavbarComponent', () => {
     authState = {
       authenticated: true,
       loaded: true,
+      blocking: false,
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
       userId: EPersonMock.id
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
index cf3658d5c94..2d1071412a8 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
@@ -4,6 +4,7 @@ import { InputSuggestionsComponent } from '../input-suggestions.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { hasValue } from '../../empty.util';
 
 @Component({
   selector: 'ds-dso-input-suggestions',
@@ -42,9 +43,11 @@ export class DsoInputSuggestionsComponent extends InputSuggestionsComponent {
   currentObject: DSpaceObject;
 
   onSubmit(data: DSpaceObject) {
-    this.value = data.name;
-    this.currentObject = data;
-    this.submitSuggestion.emit(data);
+    if (hasValue(data)) {
+      this.value = data.name;
+      this.currentObject = data;
+      this.submitSuggestion.emit(data);
+    }
   }
 
   onClickSuggestion(data: DSpaceObject) {
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 49e4c0a1d5a..7a9481f2f14 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -3,20 +3,20 @@
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <a href="#" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
-                    <span [innerHTML]="suggestionOption.displayValue"></span>
-                </a>
-            </div>
-        </div>
+  <input #inputField type="text" [(ngModel)]="value" [name]="name"
+         class="form-control suggestion_input"
+         [ngClass]="{'is-invalid': !valid}"
+         [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+         [placeholder]="placeholder"
+         [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <input type="submit" class="d-none"/>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      <div *ngFor="let suggestionOption of suggestions">
+        <a href="#" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
+          <span [innerHTML]="suggestionOption.displayValue"></span>
+        </a>
+      </div>
     </div>
+  </div>
 </form>
\ No newline at end of file
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
index c0c3c680f22..51664039f7f 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
@@ -14,10 +14,10 @@ describe('FilterInputSuggestionsComponent', () => {
   let fixture: ComponentFixture<FilterInputSuggestionsComponent>;
   let de: DebugElement;
   let el: HTMLElement;
-  const suggestions = [{displayValue: 'suggestion uno', value: 'suggestion uno'}, {
+  const suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
     displayValue: 'suggestion dos',
     value: 'suggestion dos'
-  }, {displayValue: 'suggestion tres', value: 'suggestion tres'}];
+  }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -26,7 +26,7 @@ describe('FilterInputSuggestionsComponent', () => {
       providers: [],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(FilterInputSuggestionsComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index ac4614e9afb..9e7d84d9ed7 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -40,5 +40,4 @@ export class FilterInputSuggestionsComponent extends InputSuggestionsComponent {
     this.queryInput.nativeElement.focus();
     return false;
   }
-
 }
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.scss b/src/app/shared/input-suggestions/input-suggestions.component.scss
index 263c315d30c..28cc7e8a498 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.scss
+++ b/src/app/shared/input-suggestions/input-suggestions.component.scss
@@ -15,5 +15,6 @@ form {
     position: relative;
     .dropdown-menu {
         position: absolute;
+        top: 40px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
new file mode 100644
index 00000000000..91d8217adeb
--- /dev/null
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -0,0 +1,24 @@
+<form [formGroup]="form" (ngSubmit)="onSubmit(value)"
+      [action]="action" (keydown)="onKeydown($event)"
+      (keydown.arrowdown)="shiftFocusDown($event)"
+      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+      (dsClickOutside)="checkIfValidInput(form);close();">
+  <input #inputField type="text" formControlName="metadataNameField" [(ngModel)]="value" id="name" [name]="name"
+         class="form-control suggestion_input"
+         [ngClass]="{'is-invalid': !valid}"
+         [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+         [placeholder]="placeholder"
+         ng-model-options="{standalone: true}"
+         autocomplete="off">
+  <input type="submit" class="d-none"/>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      <div *ngFor="let suggestionOption of suggestions">
+        <a href="#" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
+          <span [innerHTML]="suggestionOption.displayValue"></span>
+        </a>
+      </div>
+    </div>
+  </div>
+</form>
+
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
new file mode 100644
index 00000000000..82e838effc1
--- /dev/null
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
@@ -0,0 +1,63 @@
+import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+
+import { TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { MetadataFieldDataService } from '../../../core/data/metadata-field-data.service';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { ValidationSuggestionsComponent } from './validation-suggestions.component';
+
+describe('ValidationSuggestionsComponent', () => {
+
+  let comp: ValidationSuggestionsComponent;
+  let fixture: ComponentFixture<ValidationSuggestionsComponent>;
+  let de: DebugElement;
+  let el: HTMLElement;
+  const suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
+    displayValue: 'suggestion dos',
+    value: 'suggestion dos'
+  }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule, ReactiveFormsModule],
+      declarations: [ValidationSuggestionsComponent],
+      providers: [FormsModule,
+        ReactiveFormsModule,
+        { provide: MetadataFieldDataService, useValue: {} },
+        { provide: ObjectUpdatesService, useValue: {} },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(ValidationSuggestionsComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ValidationSuggestionsComponent);
+
+    comp = fixture.componentInstance; // LoadingComponent test instance
+    comp.suggestions = suggestions;
+    // query for the message <label> by CSS element selector
+    de = fixture.debugElement;
+    el = de.nativeElement;
+    comp.show.next(true);
+    fixture.detectChanges();
+  });
+
+  describe('when an element is clicked', () => {
+    const clickedIndex = 0;
+    beforeEach(() => {
+      spyOn(comp, 'onClickSuggestion');
+      const clickedLink = de.query(By.css('.dropdown-list > div:nth-child(' + (clickedIndex + 1) + ') a'));
+      clickedLink.triggerEventHandler('click', {});
+      fixture.detectChanges();
+    });
+    it('should call onClickSuggestion() with the suggestion as a parameter', () => {
+      expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex].value);
+    });
+  });
+});
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
new file mode 100644
index 00000000000..e7301cd35a1
--- /dev/null
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -0,0 +1,84 @@
+import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import { FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { MetadatumViewModel } from '../../../core/shared/metadata.models';
+import { MetadataFieldValidator } from '../../utils/metadatafield-validator.directive';
+import { InputSuggestionsComponent } from '../input-suggestions.component';
+import { InputSuggestion } from '../input-suggestions.model';
+
+@Component({
+  selector: 'ds-validation-suggestions',
+  styleUrls: ['./../input-suggestions.component.scss'],
+  templateUrl: './validation-suggestions.component.html',
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
+      // tslint:disable-next-line:no-forward-ref
+      useExisting: forwardRef(() => ValidationSuggestionsComponent),
+      multi: true
+    }
+  ]
+})
+
+/**
+ * Component representing a form with a autocomplete functionality
+ */
+export class ValidationSuggestionsComponent extends InputSuggestionsComponent implements OnInit {
+
+  form: FormGroup;
+
+  /**
+   * The current url of this page
+   */
+  @Input() url: string;
+
+  /**
+   * The metadatum of this field
+   */
+  @Input() metadata: MetadatumViewModel;
+
+  /**
+   * The suggestions that should be shown
+   */
+  @Input() suggestions: InputSuggestion[] = [];
+
+  constructor(private metadataFieldValidator: MetadataFieldValidator,
+              private objectUpdatesService: ObjectUpdatesService) {
+    super();
+  }
+
+  ngOnInit() {
+    this.form = new FormGroup({
+      metadataNameField: new FormControl(this._value, {
+        asyncValidators: [this.metadataFieldValidator.validate.bind(this.metadataFieldValidator)],
+        validators: [Validators.required]
+      })
+    });
+  }
+
+  onSubmit(data) {
+    this.value = data;
+    this.submitSuggestion.emit(data);
+  }
+
+  onClickSuggestion(data) {
+    this.value = data;
+    this.clickSuggestion.emit(data);
+    this.close();
+    this.blockReopen = true;
+    this.queryInput.nativeElement.focus();
+    return false;
+  }
+
+  /**
+   * Check if the input is valid according to validator and send (in)valid state to store
+   * @param form  Form with input
+   */
+  checkIfValidInput(form) {
+    this.valid = !(form.get('metadataNameField').status === 'INVALID' && (form.get('metadataNameField').dirty || form.get('metadataNameField').touched));
+    this.objectUpdatesService.setValidFieldUpdate(this.url, this.metadata.uuid, this.valid);
+    return this.valid;
+  }
+
+}
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.html b/src/app/shared/item/item-alerts/item-alerts.component.html
new file mode 100644
index 00000000000..fce5c038e54
--- /dev/null
+++ b/src/app/shared/item/item-alerts/item-alerts.component.html
@@ -0,0 +1,8 @@
+<div>
+  <div *ngIf="item && !item.isDiscoverable" class="private-warning">
+    <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
+  </div>
+  <div *ngIf="item && item.isWithdrawn" class="withdrawn-warning">
+    <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.withdrawn' | translate"></ds-alert>
+  </div>
+</div>
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.scss b/src/app/shared/item/item-alerts/item-alerts.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.spec.ts b/src/app/shared/item/item-alerts/item-alerts.component.spec.ts
new file mode 100644
index 00000000000..983283b0365
--- /dev/null
+++ b/src/app/shared/item/item-alerts/item-alerts.component.spec.ts
@@ -0,0 +1,87 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ItemAlertsComponent } from './item-alerts.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { Item } from '../../../core/shared/item.model';
+import { By } from '@angular/platform-browser';
+
+describe('ItemAlertsComponent', () => {
+  let component: ItemAlertsComponent;
+  let fixture: ComponentFixture<ItemAlertsComponent>;
+  let item: Item;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ItemAlertsComponent],
+      imports: [TranslateModule.forRoot()],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAlertsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('when the item is discoverable', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isDiscoverable: true
+      });
+      component.item = item;
+      fixture.detectChanges();
+    });
+
+    it('should not display the private alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.private-warning'));
+      expect(privateWarning).toBeNull();
+    });
+  });
+
+  describe('when the item is not discoverable', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isDiscoverable: false
+      });
+      component.item = item;
+      fixture.detectChanges();
+    });
+
+    it('should display the private alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.private-warning'));
+      expect(privateWarning).not.toBeNull();
+    });
+  });
+
+  describe('when the item is withdrawn', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isWithdrawn: true
+      });
+      component.item = item;
+      fixture.detectChanges();
+    });
+
+    it('should display the withdrawn alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.withdrawn-warning'));
+      expect(privateWarning).not.toBeNull();
+    });
+  });
+
+  describe('when the item is not withdrawn', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isWithdrawn: false
+      });
+      component.item = item;
+      fixture.detectChanges();
+    });
+
+    it('should not display the withdrawn alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.withdrawn-warning'));
+      expect(privateWarning).toBeNull();
+    });
+  });
+});
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.ts b/src/app/shared/item/item-alerts/item-alerts.component.ts
new file mode 100644
index 00000000000..4c2d60d24cf
--- /dev/null
+++ b/src/app/shared/item/item-alerts/item-alerts.component.ts
@@ -0,0 +1,24 @@
+import { Component, Input } from '@angular/core';
+import { Item } from '../../../core/shared/item.model';
+import { AlertType } from '../../alert/aletr-type';
+
+@Component({
+  selector: 'ds-item-alerts',
+  templateUrl: './item-alerts.component.html',
+  styleUrls: ['./item-alerts.component.scss']
+})
+/**
+ * Component displaying alerts for an item
+ */
+export class ItemAlertsComponent {
+  /**
+   * The Item to display alerts for
+   */
+  @Input() item: Item;
+
+  /**
+   * The AlertType enumeration
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+}
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts
index 684599d3b5d..d07079af2dc 100644
--- a/src/app/shared/item/item-versions/item-versions.component.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.ts
@@ -7,13 +7,14 @@ import { VersionHistory } from '../../../core/shared/version-history.model';
 import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { map, startWith, switchMap } from 'rxjs/operators';
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
 import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 import { AlertType } from '../../alert/aletr-type';
 import { followLink } from '../../utils/follow-link-config.model';
+import { hasValueOperator } from '../../empty.util';
 
 @Component({
   selector: 'ds-item-versions',
@@ -98,11 +99,13 @@ export class ItemVersionsComponent implements OnInit {
     this.versionHistoryRD$ = this.versionRD$.pipe(
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
+      hasValueOperator(),
       switchMap((version: Version) => version.versionhistory)
     );
     const versionHistory$ = this.versionHistoryRD$.pipe(
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
+      hasValueOperator(),
     );
     this.versionsRD$ = observableCombineLatest(versionHistory$, this.currentPage$).pipe(
       switchMap(([versionHistory, page]: [VersionHistory, number]) =>
@@ -113,6 +116,7 @@ export class ItemVersionsComponent implements OnInit {
     this.hasEpersons$ = this.versionsRD$.pipe(
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
+      hasValueOperator(),
       map((versions: PaginatedList<Version>) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0),
       startWith(false)
     );
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
index c2bd3161376..246267bfd69 100644
--- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
+++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
@@ -6,14 +6,14 @@ import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { VersionHistory } from '../../../../core/shared/version-history.model';
 import { Version } from '../../../../core/shared/version.model';
-import { hasValue } from '../../../empty.util';
+import { hasValue, hasValueOperator } from '../../../empty.util';
 import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators';
 import { filter, map, startWith, switchMap } from 'rxjs/operators';
 import { followLink } from '../../../utils/follow-link-config.model';
 import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
 import { AlertType } from '../../../alert/aletr-type';
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { getItemPageRoute } from '../../../../+item-page/item-page-routing.module';
+import { getItemPageRoute } from '../../../../+item-page/item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-versions-notice',
@@ -78,6 +78,7 @@ export class ItemVersionsNoticeComponent implements OnInit {
       this.versionHistoryRD$ = this.versionRD$.pipe(
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
+        hasValueOperator(),
         switchMap((version: Version) => version.versionhistory)
       );
       const versionHistory$ = this.versionHistoryRD$.pipe(
@@ -89,6 +90,7 @@ export class ItemVersionsNoticeComponent implements OnInit {
           this.versionHistoryService.getVersions(versionHistory.id, latestVersionSearch, followLink('item'))),
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
+        hasValueOperator(),
         filter((versions) => versions.page.length > 0),
         map((versions) => versions.page[0])
       );
diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts
index 4e24ba4d04d..9b8ee2e343e 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -1,13 +1,14 @@
-import { LangSwitchComponent } from './lang-switch.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+import { Observable, of } from 'rxjs';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+
+import { LangSwitchComponent } from './lang-switch.component';
 import { LangConfig } from '../../../config/lang-config.interface';
-import { Observable, of } from 'rxjs';
-import { By } from '@angular/platform-browser';
-import { CookieServiceMock } from '../mocks/cookie.service.mock';
-import { CookieService } from '../../core/services/cookie.service';
+import { LocaleService } from '../../core/locale/locale.service';
 
 // This test is completely independent from any message catalogs or keys in the codebase
 // The translation module is instantiated with these bogus messages that we aren't using anyway.
@@ -31,13 +32,16 @@ class CustomLoader implements TranslateLoader {
 /* tslint:enable:quotemark */
 /* tslint:enable:object-literal-key-quotes */
 
-let cookie: CookieService;
+let localService: any;
 
 describe('LangSwitchComponent', () => {
 
-  beforeEach(() => {
-    cookie = Object.assign(new CookieServiceMock());
-  });
+  function getMockLocaleService(): LocaleService {
+    return jasmine.createSpyObj('LocaleService', {
+      setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode'),
+      refreshAfterChangeLanguage: jasmine.createSpy('refreshAfterChangeLanguage')
+    })
+  }
 
   describe('with English and Deutsch activated, English as default', () => {
     let component: LangSwitchComponent;
@@ -72,7 +76,7 @@ describe('LangSwitchComponent', () => {
         schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
-          { provide: CookieService, useValue: cookie }
+          { provide: LocaleService, useValue: getMockLocaleService() },
         ]
       }).compileComponents()
         .then(() => {
@@ -82,6 +86,7 @@ describe('LangSwitchComponent', () => {
           translate.use('en');
           http = TestBed.get(HttpTestingController);
           fixture = TestBed.createComponent(LangSwitchComponent);
+          localService = TestBed.get(LocaleService);
           component = fixture.componentInstance;
           de = fixture.debugElement;
           langSwitchElement = de.nativeElement;
@@ -110,19 +115,16 @@ describe('LangSwitchComponent', () => {
     describe('when selecting a language', () => {
       beforeEach(() => {
         spyOn(translate, 'use');
-        spyOn(cookie, 'set');
         const langItem = fixture.debugElement.query(By.css('.dropdown-item')).nativeElement;
         langItem.click();
         fixture.detectChanges();
       });
 
-      it('should translate the app', () => {
-        expect(translate.use).toHaveBeenCalled();
+      it('should translate the app and set the client\'s language cookie', () => {
+        expect(localService.setCurrentLanguageCode).toHaveBeenCalled();
+        expect(localService.refreshAfterChangeLanguage).toHaveBeenCalled();
       });
 
-      it('should set the client\'s language cookie', () => {
-        expect(cookie.set).toHaveBeenCalled();
-      });
     });
   });
 
@@ -160,7 +162,7 @@ describe('LangSwitchComponent', () => {
         schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
-          { provide: CookieService, useValue: cookie }
+          { provide: LocaleService, useValue: getMockLocaleService() }
         ]
       }).compileComponents();
       translate = TestBed.get(TranslateService);
diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts
index 433d9038d79..e28b1d4bb7d 100644
--- a/src/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.ts
@@ -1,9 +1,10 @@
-import {Component, Inject, OnInit} from '@angular/core';
-import {TranslateService} from '@ngx-translate/core';
-import {LangConfig} from '../../../config/lang-config.interface';
-import { LANG_COOKIE } from '../../app.component';
-import { CookieService } from '../../core/services/cookie.service';
+import { Component, Inject, OnInit } from '@angular/core';
+
+import { TranslateService } from '@ngx-translate/core';
+
+import { LangConfig } from '../../../config/lang-config.interface';
 import { environment } from '../../../environments/environment';
+import { LocaleService } from '../../core/locale/locale.service';
 
 @Component({
   selector: 'ds-lang-switch',
@@ -25,7 +26,7 @@ export class LangSwitchComponent implements OnInit {
 
   constructor(
     public translate: TranslateService,
-    public cookie: CookieService
+    private localeService: LocaleService
   ) {
   }
 
@@ -53,8 +54,8 @@ export class LangSwitchComponent implements OnInit {
    * @param lang    The language to switch to
    */
   useLang(lang: string) {
-    this.translate.use(lang);
-    this.cookie.set(LANG_COOKIE, lang);
+    this.localeService.setCurrentLanguageCode(lang);
+    this.localeService.refreshAfterChangeLanguage();
   }
 
 }
diff --git a/src/app/shared/log-in/container/log-in-container.component.spec.ts b/src/app/shared/log-in/container/log-in-container.component.spec.ts
index 41673cc773a..aa4888104f7 100644
--- a/src/app/shared/log-in/container/log-in-container.component.spec.ts
+++ b/src/app/shared/log-in/container/log-in-container.component.spec.ts
@@ -12,6 +12,7 @@ import { AuthService } from '../../../core/auth/auth.service';
 import { AuthMethod } from '../../../core/auth/models/auth.method';
 import { AuthServiceStub } from '../../testing/auth-service.stub';
 import { createTestComponent } from '../../testing/utils.test';
+import { HardRedirectService } from '../../../core/services/hard-redirect.service';
 
 describe('LogInContainerComponent', () => {
 
@@ -20,7 +21,13 @@ describe('LogInContainerComponent', () => {
 
   const authMethod = new AuthMethod('password');
 
+  let hardRedirectService: HardRedirectService;
+
   beforeEach(async(() => {
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      redirect: {},
+      getCurrentRoute: {}
+    });
     // refine the test module by declaring the test component
     TestBed.configureTestingModule({
       imports: [
@@ -35,6 +42,7 @@ describe('LogInContainerComponent', () => {
       ],
       providers: [
         {provide: AuthService, useClass: AuthServiceStub},
+        { provide: HardRedirectService, useValue: hardRedirectService },
         LogInContainerComponent
       ],
       schemas: [
diff --git a/src/app/shared/log-in/container/log-in-container.component.ts b/src/app/shared/log-in/container/log-in-container.component.ts
index 660e616b9dc..46459362bef 100644
--- a/src/app/shared/log-in/container/log-in-container.component.ts
+++ b/src/app/shared/log-in/container/log-in-container.component.ts
@@ -15,6 +15,12 @@ export class LogInContainerComponent implements OnInit {
 
   @Input() authMethod: AuthMethod;
 
+  /**
+   * A boolean representing if LogInContainerComponent is in a standalone page
+   * @type {boolean}
+   */
+  @Input() isStandalonePage: boolean;
+
   /**
    * Injector to inject a section component with the @Input parameters
    * @type {Injector}
@@ -36,6 +42,7 @@ export class LogInContainerComponent implements OnInit {
     this.objectInjector = Injector.create({
       providers: [
         { provide: 'authMethodProvider', useFactory: () => (this.authMethod), deps: [] },
+        { provide: 'isStandalonePage', useFactory: () => (this.isStandalonePage), deps: [] },
       ],
       parent: this.injector
     });
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 8e23f00d9b7..8fb5a339548 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -4,10 +4,10 @@
     <div *ngIf="i === 1" class="text-center mt-2">
       <span class="align-middle">{{"login.form.or-divider" | translate}}</span>
     </div>
-    <ds-log-in-container [authMethod]="authMethod"></ds-log-in-container>
+    <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
   </ng-container>
 
   <div class="dropdown-divider"></div>
-  <a class="dropdown-item" href="#">{{"login.form.new-user" | translate}}</a>
-  <a class="dropdown-item" href="#">{{"login.form.forgot-password" | translate}}</a>
+  <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]">{{"login.form.new-user" | translate}}</a>
+  <a class="dropdown-item" [routerLink]="[getForgotRoute()]">{{"login.form.forgot-password" | translate}}</a>
 </div>
diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts
index 0167d616869..120e1a8e906 100644
--- a/src/app/shared/log-in/log-in.component.spec.ts
+++ b/src/app/shared/log-in/log-in.component.spec.ts
@@ -1,7 +1,7 @@
 import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Store, StoreModule } from '@ngrx/store';
+import { StoreModule } from '@ngrx/store';
 
 import { LogInComponent } from './log-in.component';
 import { authReducer } from '../../core/auth/auth.reducer';
@@ -13,11 +13,14 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { SharedModule } from '../shared.module';
 import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
 import { ActivatedRouteStub } from '../testing/active-router.stub';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../testing/router.stub';
+import { ActivatedRoute } from '@angular/router';
 import { NativeWindowService } from '../../core/services/window.service';
 import { provideMockStore } from '@ngrx/store/testing';
 import { createTestComponent } from '../testing/utils.test';
+import { RouterTestingModule } from '@angular/router/testing';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { of } from 'rxjs/internal/observable/of';
 
 describe('LogInComponent', () => {
 
@@ -33,8 +36,19 @@ describe('LogInComponent', () => {
       }
     }
   };
+  let hardRedirectService: HardRedirectService;
+
+  let authorizationService: AuthorizationDataService;
 
   beforeEach(async(() => {
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      redirect: {},
+      getCurrentRoute: {}
+    });
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: of(true)
+    });
+
     // refine the test module by declaring the test component
     TestBed.configureTestingModule({
       imports: [
@@ -46,6 +60,7 @@ describe('LogInComponent', () => {
             strictActionImmutability: false
           }
         }),
+        RouterTestingModule,
         SharedModule,
         TranslateModule.forRoot()
       ],
@@ -55,8 +70,10 @@ describe('LogInComponent', () => {
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-        { provide: Router, useValue: new RouterStub() },
+        // { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: HardRedirectService, useValue: hardRedirectService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
         provideMockStore({ initialState }),
         LogInComponent
       ],
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index 92350de442d..c0df6adec8f 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -1,13 +1,19 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-
+import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
-import { filter, takeWhile, } from 'rxjs/operators';
 import { select, Store } from '@ngrx/store';
-
 import { AuthMethod } from '../../core/auth/models/auth.method';
-import { getAuthenticationMethods, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
+import {
+  getAuthenticationError,
+  getAuthenticationMethods,
+  isAuthenticated,
+  isAuthenticationLoading
+} from '../../core/auth/selectors';
 import { CoreState } from '../../core/core.reducers';
+import { getForgotPasswordRoute, getRegisterRoute } from '../../app-routing-paths';
+import { hasValue } from '../empty.util';
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 /**
  * /users/sign-in
@@ -18,7 +24,7 @@ import { AuthService } from '../../core/auth/auth.service';
   templateUrl: './log-in.component.html',
   styleUrls: ['./log-in.component.scss']
 })
-export class LogInComponent implements OnInit, OnDestroy {
+export class LogInComponent implements OnInit {
 
   /**
    * A boolean representing if LogInComponent is in a standalone page
@@ -45,13 +51,13 @@ export class LogInComponent implements OnInit, OnDestroy {
   public loading: Observable<boolean>;
 
   /**
-   * Component state.
-   * @type {boolean}
+   * Whether or not the current user (or anonymous) is authorized to register an account
    */
-  private alive = true;
+  canRegister$: Observable<boolean>;
 
   constructor(private store: Store<CoreState>,
-              private authService: AuthService,) {
+              private authService: AuthService,
+              private authorizationService: AuthorizationDataService) {
   }
 
   ngOnInit(): void {
@@ -66,20 +72,21 @@ export class LogInComponent implements OnInit, OnDestroy {
     // set isAuthenticated
     this.isAuthenticated = this.store.pipe(select(isAuthenticated));
 
-    // subscribe to success
-    this.store.pipe(
-      select(isAuthenticated),
-      takeWhile(() => this.alive),
-      filter((authenticated) => authenticated))
-      .subscribe(() => {
-          this.authService.redirectAfterLoginSuccess(this.isStandalonePage);
-        }
-      );
+    // Clear the redirect URL if an authentication error occurs and this is not a standalone page
+    this.store.pipe(select(getAuthenticationError)).subscribe((error) => {
+      if (hasValue(error) && !this.isStandalonePage) {
+        this.authService.clearRedirectUrl();
+      }
+    });
 
+    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration);
   }
 
-  ngOnDestroy(): void {
-    this.alive = false;
+  getRegisterRoute() {
+    return getRegisterRoute();
   }
 
+  getForgotRoute() {
+    return getForgotPasswordRoute();
+  }
 }
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index ddd5083d440..16f42a1e163 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -1,4 +1,5 @@
-<form  (ngSubmit)="submit()"
+<form class="form-login"
+      (ngSubmit)="submit()"
       [formGroup]="form" novalidate>
   <label for="inputEmail" class="sr-only">{{"login.form.email" | translate}}</label>
   <input id="inputEmail"
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
index 68c939d1bc9..5291c161501 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
@@ -15,6 +15,7 @@ import { AuthServiceStub } from '../../../testing/auth-service.stub';
 import { AppState } from '../../../../app.reducer';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
 describe('LogInPasswordComponent', () => {
 
@@ -29,8 +30,14 @@ describe('LogInPasswordComponent', () => {
     loading: false,
   };
 
+  let hardRedirectService: HardRedirectService;
+
   beforeEach(() => {
     user = EPersonMock;
+
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      getCurrentRoute: {}
+    });
   });
 
   beforeEach(async(() => {
@@ -47,7 +54,9 @@ describe('LogInPasswordComponent', () => {
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password) }
+        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password) },
+        { provide: 'isStandalonePage', useValue: true },
+        { provide: HardRedirectService, useValue: hardRedirectService },
       ],
       schemas: [
         CUSTOM_ELEMENTS_SCHEMA
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index 8b0dd8cc040..c72881d3bfc 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -13,6 +13,8 @@ import { fadeOut } from '../../../animations/fade';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
 import { renderAuthMethodFor } from '../log-in.methods-decorator';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
 /**
  * /users/sign-in
@@ -66,11 +68,17 @@ export class LogInPasswordComponent implements OnInit {
   /**
    * @constructor
    * @param {AuthMethod} injectedAuthMethodModel
+   * @param {boolean} isStandalonePage
+   * @param {AuthService} authService
+   * @param {HardRedirectService} hardRedirectService
    * @param {FormBuilder} formBuilder
    * @param {Store<State>} store
    */
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
+    @Inject('isStandalonePage') public isStandalonePage: boolean,
+    private authService: AuthService,
+    private hardRedirectService: HardRedirectService,
     private formBuilder: FormBuilder,
     private store: Store<CoreState>
   ) {
@@ -134,6 +142,12 @@ export class LogInPasswordComponent implements OnInit {
     email.trim();
     password.trim();
 
+    if (!this.isStandalonePage) {
+      this.authService.setRedirectUrl(this.hardRedirectService.getCurrentRoute());
+    } else {
+      this.authService.setRedirectUrlIfNotSet('/');
+    }
+
     // dispatch AuthenticationAction
     this.store.dispatch(new AuthenticateAction(email, password));
 
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
index 7c1e782ee0d..e8b18fa409b 100644
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
+++ b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
@@ -17,6 +17,7 @@ import { NativeWindowService } from '../../../../core/services/window.service';
 import { RouterStub } from '../../../testing/router.stub';
 import { ActivatedRouteStub } from '../../../testing/active-router.stub';
 import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
 describe('LogInShibbolethComponent', () => {
 
@@ -30,6 +31,7 @@ describe('LogInShibbolethComponent', () => {
   let location;
 
   let authState;
+  let hardRedirectService: HardRedirectService;
 
   beforeEach(() => {
     user = EPersonMock;
@@ -41,6 +43,11 @@ describe('LogInShibbolethComponent', () => {
       loaded: false,
       loading: false,
     };
+
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      getCurrentRoute: {},
+      redirect: {}
+    });
   });
 
   beforeEach(async(() => {
@@ -56,9 +63,11 @@ describe('LogInShibbolethComponent', () => {
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
         { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Shibboleth, location) },
+        { provide: 'isStandalonePage', useValue: true },
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: HardRedirectService, useValue: hardRedirectService },
       ],
       schemas: [
         CUSTOM_ELEMENTS_SCHEMA
@@ -99,7 +108,7 @@ describe('LogInShibbolethComponent', () => {
 
     component.redirectToShibboleth();
 
-    expect(setHrefSpy).toHaveBeenCalledWith(shibbolethBaseUrl + currentUrl)
+    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl)
 
   });
 
@@ -114,7 +123,7 @@ describe('LogInShibbolethComponent', () => {
 
     component.redirectToShibboleth();
 
-    expect(setHrefSpy).toHaveBeenCalledWith(shibbolethBaseUrl + currentUrl)
+    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl)
 
   });
 
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts
index 6321e6119ff..b0704d5cb15 100644
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts
+++ b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts
@@ -11,7 +11,11 @@ import { CoreState } from '../../../../core/core.reducers';
 import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/selectors';
 import { RouteService } from '../../../../core/services/route.service';
 import { NativeWindowRef, NativeWindowService } from '../../../../core/services/window.service';
-import { isNotNull } from '../../../empty.util';
+import { isNotNull, isEmpty } from '../../../empty.util';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { take } from 'rxjs/operators';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
 
 @Component({
   selector: 'ds-log-in-shibboleth',
@@ -49,14 +53,20 @@ export class LogInShibbolethComponent implements OnInit {
   /**
    * @constructor
    * @param {AuthMethod} injectedAuthMethodModel
+   * @param {boolean} isStandalonePage
    * @param {NativeWindowRef} _window
    * @param {RouteService} route
+   * @param {AuthService} authService
+   * @param {HardRedirectService} hardRedirectService
    * @param {Store<State>} store
    */
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
+    @Inject('isStandalonePage') public isStandalonePage: boolean,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     private route: RouteService,
+    private authService: AuthService,
+    private hardRedirectService: HardRedirectService,
     private store: Store<CoreState>
   ) {
     this.authMethod = injectedAuthMethodModel;
@@ -75,21 +85,31 @@ export class LogInShibbolethComponent implements OnInit {
   }
 
   redirectToShibboleth() {
-    let newLocationUrl = this.location;
-    const currentUrl = this._window.nativeWindow.location.href;
-    const myRegexp = /\?redirectUrl=(.*)/g;
-    const match = myRegexp.exec(this.location);
-    const redirectUrl = (match && match[1]) ? match[1] : null;
-
-    // Check whether the current page is different from the redirect url received from rest
-    if (isNotNull(redirectUrl) && redirectUrl !== currentUrl) {
-      // change the redirect url with the current page url
-      const newRedirectUrl = `?redirectUrl=${currentUrl}`;
-      newLocationUrl = this.location.replace(/\?redirectUrl=(.*)/g, newRedirectUrl);
-    }
-
-    // redirect to shibboleth authentication url
-    this._window.nativeWindow.location.href = newLocationUrl;
+
+    this.authService.getRedirectUrl().pipe(take(1)).subscribe((redirectRoute) => {
+      if (!this.isStandalonePage) {
+        redirectRoute = this.hardRedirectService.getCurrentRoute();
+      } else if (isEmpty(redirectRoute)) {
+        redirectRoute = '/';
+      }
+      const correctRedirectUrl = new URLCombiner(this._window.nativeWindow.origin, redirectRoute).toString();
+
+      let shibbolethServerUrl = this.location;
+      const myRegexp = /\?redirectUrl=(.*)/g;
+      const match = myRegexp.exec(this.location);
+      const redirectUrlFromServer = (match && match[1]) ? match[1] : null;
+
+      // Check whether the current page is different from the redirect url received from rest
+      if (isNotNull(redirectUrlFromServer) && redirectUrlFromServer !== correctRedirectUrl) {
+        // change the redirect url with the current page url
+        const newRedirectUrl = `?redirectUrl=${correctRedirectUrl}`;
+        shibbolethServerUrl = this.location.replace(/\?redirectUrl=(.*)/g, newRedirectUrl);
+      }
+
+      // redirect to shibboleth authentication url
+      this.hardRedirectService.redirect(shibbolethServerUrl);
+    });
+
   }
 
 }
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index f7e4f7d8675..96574220849 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -1,13 +1,15 @@
-import { Component, Injector } from '@angular/core';
+import { Component, Injector, OnInit, OnDestroy } from '@angular/core';
 import { MenuService } from '../menu.service';
 import { MenuSection } from '../menu.reducer';
 import { getComponentForMenuItemType } from '../menu-item.decorator';
 import { MenuID, MenuItemType } from '../initial-menus-state';
-import { hasNoValue } from '../../empty.util';
+import { hasNoValue, hasValue } from '../../empty.util';
 import { Observable } from 'rxjs/internal/Observable';
 import { MenuItemModel } from '../menu-item/models/menu-item.model';
-import { distinctUntilChanged } from 'rxjs/operators';
+import { distinctUntilChanged, switchMap } from 'rxjs/operators';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { BehaviorSubject } from 'rxjs';
 
 /**
  * A basic implementation of a menu section's component
@@ -16,7 +18,7 @@ import { GenericConstructor } from '../../../core/shared/generic-constructor';
   selector: 'ds-menu-section',
   template: ''
 })
-export class MenuSectionComponent {
+export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
    * Observable that emits whether or not this section is currently active
@@ -29,19 +31,23 @@ export class MenuSectionComponent {
   menuID: MenuID;
 
   /**
-   * List of Injectors for each dynamically rendered menu item of this section
+   * List of available subsections in this section
    */
-  itemInjectors: Map<string, Injector> = new Map<string, Injector>();
+  subSections$: Observable<MenuSection[]>;
 
   /**
-   * List of child Components for each dynamically rendered menu item of this section
+   * Map of components and injectors for each dynamically rendered menu section
    */
-  itemComponents: Map<string, GenericConstructor<MenuSectionComponent>> = new Map<string, GenericConstructor<MenuSectionComponent>>();
+  sectionMap$: BehaviorSubject<Map<string, {
+    injector: Injector,
+    component: GenericConstructor<MenuSectionComponent>
+  }>> = new BehaviorSubject(new Map());
 
   /**
-   * List of available subsections in this section
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
    */
-  subSections: Observable<MenuSection[]>;
+  subs: Subscription[] = [];
 
   constructor(public section: MenuSection, protected menuService: MenuService, protected injector: Injector) {
   }
@@ -85,15 +91,34 @@ export class MenuSectionComponent {
    * Method for initializing all injectors and component constructors for the menu items in this section
    */
   private initializeInjectorData() {
-    this.itemInjectors.set(this.section.id, this.getItemModelInjector(this.section.model));
-    this.itemComponents.set(this.section.id, this.getMenuItemComponent(this.section.model));
-    this.subSections = this.menuService.getSubSectionsByParentID(this.menuID, this.section.id);
-    this.subSections.subscribe((sections: MenuSection[]) => {
-      sections.forEach((section: MenuSection) => {
-        this.itemInjectors.set(section.id, this.getItemModelInjector(section.model));
-        this.itemComponents.set(section.id, this.getMenuItemComponent(section.model));
+    this.updateSectionMap(
+      this.section.id,
+      this.getItemModelInjector(this.section.model),
+      this.getMenuItemComponent(this.section.model)
+    );
+    this.subSections$ = this.menuService.getSubSectionsByParentID(this.menuID, this.section.id);
+    this.subs.push(
+      this.subSections$.pipe(
+        // if you return an array from a switchMap it will emit each element as a separate event.
+        // So this switchMap is equivalent to a subscribe with a forEach inside
+        switchMap((sections: MenuSection[]) => sections)
+      ).subscribe((section: MenuSection) => {
+        this.updateSectionMap(
+          section.id,
+          this.getItemModelInjector(section.model),
+          this.getMenuItemComponent(section.model)
+        )
       })
-    })
+    );
+  }
+
+  /**
+   * Update the sectionMap
+   */
+  private updateSectionMap(id, injector, component) {
+    const nextMap = this.sectionMap$.getValue();
+    nextMap.set(id, { injector, component });
+    this.sectionMap$.next(nextMap);
   }
 
   /**
@@ -124,4 +149,12 @@ export class MenuSectionComponent {
     });
   }
 
+  /**
+   * Unsubscribe from open subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
 }
diff --git a/src/app/shared/menu/menu.component.spec.ts b/src/app/shared/menu/menu.component.spec.ts
index 625c96e7958..2b83ec4414e 100644
--- a/src/app/shared/menu/menu.component.spec.ts
+++ b/src/app/shared/menu/menu.component.spec.ts
@@ -7,19 +7,25 @@ import { MenuComponent } from './menu.component';
 import { MenuServiceStub } from '../testing/menu-service.stub';
 import { of as observableOf } from 'rxjs';
 import { MenuSection } from './menu.reducer';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { MenuID } from './initial-menus-state';
 
 describe('MenuComponent', () => {
   let comp: MenuComponent;
   let fixture: ComponentFixture<MenuComponent>;
   let menuService: MenuService;
+  let router: any;
+
+  const mockMenuID = 'mock-menuID' as MenuID;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule],
+      imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
       declarations: [MenuComponent],
       providers: [
         { provide: Injector, useValue: {} },
-        { provide: MenuService, useClass: MenuServiceStub },
+        { provide: MenuService, useClass: MenuServiceStub }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(MenuComponent, {
@@ -30,7 +36,9 @@ describe('MenuComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(MenuComponent);
     comp = fixture.componentInstance; // SearchPageComponent test instance
+    comp.menuID = mockMenuID;
     menuService = (comp as any).menuService;
+    router = TestBed.get(Router);
     spyOn(comp as any, 'getSectionDataInjector').and.returnValue(MenuSection);
     spyOn(comp as any, 'getSectionComponent').and.returnValue(observableOf({}));
     fixture.detectChanges();
diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts
index 1e81fa2dda4..cc0379ac374 100644
--- a/src/app/shared/menu/menu.component.ts
+++ b/src/app/shared/menu/menu.component.ts
@@ -1,13 +1,16 @@
-import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, OnDestroy, OnInit } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
-import { MenuService } from '../../shared/menu/menu.service';
-import { MenuID } from '../../shared/menu/initial-menus-state';
-import { MenuSection } from '../../shared/menu/menu.reducer';
-import { first, map } from 'rxjs/operators';
+import { MenuService } from './menu.service';
+import { MenuID } from './initial-menus-state';
+import { MenuSection } from './menu.reducer';
+import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
 import { hasValue } from '../empty.util';
 import { MenuSectionComponent } from './menu-section/menu-section.component';
 import { getComponentForMenu } from './menu-section.decorator';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { BehaviorSubject } from 'rxjs';
+import { compareArraysUsingIds } from '../../+item-page/simple/item-types/shared/item-relationships-utils';
 
 /**
  * A basic implementation of a MenuComponent
@@ -16,7 +19,7 @@ import { getComponentForMenu } from './menu-section.decorator';
   selector: 'ds-menu',
   template: ''
 })
-export class MenuComponent implements OnInit {
+export class MenuComponent implements OnInit, OnDestroy {
   /**
    * The ID of the Menu (See MenuID)
    */
@@ -43,14 +46,12 @@ export class MenuComponent implements OnInit {
   sections: Observable<MenuSection[]>;
 
   /**
-   * List of Injectors for each dynamically rendered menu section
+   * Map of components and injectors for each dynamically rendered menu section
    */
-  sectionInjectors: Map<string, Injector> = new Map<string, Injector>();
-
-  /**
-   * List of child Components for each dynamically rendered menu section
-   */
-  sectionComponents: Map<string, GenericConstructor<MenuSectionComponent>> = new Map<string, GenericConstructor<MenuSectionComponent>>();
+  sectionMap$: BehaviorSubject<Map<string, {
+    injector: Injector,
+    component: GenericConstructor<MenuSectionComponent>
+  }>> = new BehaviorSubject(new Map());
 
   /**
    * Prevent unnecessary rerendering
@@ -62,6 +63,12 @@ export class MenuComponent implements OnInit {
    */
   private previewTimer;
 
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  subs: Subscription[] = [];
+
   constructor(protected menuService: MenuService, protected injector: Injector) {
   }
 
@@ -72,13 +79,25 @@ export class MenuComponent implements OnInit {
     this.menuCollapsed = this.menuService.isMenuCollapsed(this.menuID);
     this.menuPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
     this.menuVisible = this.menuService.isMenuVisible(this.menuID);
-    this.sections = this.menuService.getMenuTopSections(this.menuID).pipe(first());
-    this.sections.subscribe((sections: MenuSection[]) => {
-      sections.forEach((section: MenuSection) => {
-        this.sectionInjectors.set(section.id, this.getSectionDataInjector(section));
-        this.getSectionComponent(section).pipe(first()).subscribe((constr) => this.sectionComponents.set(section.id, constr));
-      });
-    });
+    this.sections = this.menuService.getMenuTopSections(this.menuID).pipe(distinctUntilChanged(compareArraysUsingIds()));
+    this.subs.push(
+      this.sections.pipe(
+        // if you return an array from a switchMap it will emit each element as a separate event.
+        // So this switchMap is equivalent to a subscribe with a forEach inside
+        switchMap((sections: MenuSection[]) => sections),
+        switchMap((section: MenuSection) => this.getSectionComponent(section).pipe(
+          map((component: GenericConstructor<MenuSectionComponent>) =>  ({ section, component }))
+        )),
+        distinctUntilChanged((x,y) => x.section.id === y.section.id)
+      ).subscribe(({ section, component}) => {
+        const nextMap = this.sectionMap$.getValue();
+        nextMap.set(section.id, {
+          injector: this.getSectionDataInjector(section),
+          component
+        });
+        this.sectionMap$.next(nextMap);
+      })
+    );
   }
 
   /**
@@ -164,4 +183,13 @@ export class MenuComponent implements OnInit {
       parent: this.injector
     });
   }
+
+  /**
+   * Unsubscribe from open subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
 }
diff --git a/src/app/shared/menu/menu.effects.spec.ts b/src/app/shared/menu/menu.effects.spec.ts
new file mode 100644
index 00000000000..911dbe1de6a
--- /dev/null
+++ b/src/app/shared/menu/menu.effects.spec.ts
@@ -0,0 +1,144 @@
+import { MenuID, MenuItemType } from './initial-menus-state';
+import { MenuSection } from './menu.reducer';
+import { LinkMenuItemModel } from './menu-item/models/link.model';
+import { TestBed } from '@angular/core/testing';
+import { MenuService } from './menu.service';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { provideMockActions } from '@ngrx/effects/testing';
+import { of as observableOf } from 'rxjs';
+import { cold, hot } from 'jasmine-marbles';
+import { ROUTER_NAVIGATED } from '@ngrx/router-store';
+import { MenuEffects } from './menu.effects';
+
+describe('MenuEffects', () => {
+  let menuEffects: MenuEffects;
+  let routeDataMenuSection: MenuSection;
+  let routeDataMenuSectionResolved: MenuSection;
+  let routeDataMenuChildSection: MenuSection;
+  let toBeRemovedMenuSection: MenuSection;
+  let alreadyPresentMenuSection: MenuSection;
+  let route;
+  let menuService;
+  let actions: Observable<any>;
+
+  function init() {
+    routeDataMenuSection = {
+      id: 'mockSection_:idparam',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockSection',
+        link: 'path/:linkparam'
+      } as LinkMenuItemModel
+    };
+    routeDataMenuSectionResolved = {
+      id: 'mockSection_id_param_resolved',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockSection',
+        link: 'path/link_param_resolved'
+      } as LinkMenuItemModel
+    };
+    routeDataMenuChildSection = {
+      id: 'mockChildSection',
+      parentID: 'mockSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockChildSection',
+        link: ''
+      } as LinkMenuItemModel
+    };
+    toBeRemovedMenuSection = {
+      id: 'toBeRemovedSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.toBeRemovedSection',
+        link: ''
+      } as LinkMenuItemModel
+    };
+    alreadyPresentMenuSection = {
+      id: 'alreadyPresentSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.alreadyPresentSection',
+        link: ''
+      } as LinkMenuItemModel
+    };
+    route = {
+      root: {
+        snapshot: {
+          data: {
+            menu: {
+              [MenuID.PUBLIC]: [routeDataMenuSection, alreadyPresentMenuSection]
+            }
+          },
+          params: {
+            idparam: 'id_param_resolved',
+            linkparam: 'link_param_resolved',
+          }
+        },
+        firstChild: {
+          snapshot: {
+            data: {
+              menu: {
+                [MenuID.PUBLIC]: routeDataMenuChildSection
+              }
+            }
+          }
+        }
+      }
+    };
+
+    menuService = jasmine.createSpyObj('menuService', {
+      getNonPersistentMenuSections: observableOf([toBeRemovedMenuSection, alreadyPresentMenuSection]),
+      addSection: {},
+      removeSection: {}
+    });
+  }
+
+  beforeEach(() => {
+    init();
+    TestBed.configureTestingModule({
+      providers: [
+        MenuEffects,
+        { provide: MenuService, useValue: menuService },
+        { provide: ActivatedRoute, useValue: route },
+        provideMockActions(() => actions)
+      ]
+    });
+
+    menuEffects = TestBed.get(MenuEffects);
+  });
+
+  describe('buildRouteMenuSections$', () => {
+    it('should add and remove menu sections depending on the current route', () => {
+      actions = hot('--a-', {
+        a: {
+          type: ROUTER_NAVIGATED
+        }
+      });
+
+      const expected = cold('--b-', {
+        b: {
+          type: ROUTER_NAVIGATED
+        }
+      });
+
+      expect(menuEffects.buildRouteMenuSections$).toBeObservable(expected);
+      expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuSectionResolved);
+      expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
+      expect(menuService.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, alreadyPresentMenuSection);
+      expect(menuService.removeSection).toHaveBeenCalledWith(MenuID.PUBLIC, toBeRemovedMenuSection.id);
+    });
+  });
+});
diff --git a/src/app/shared/menu/menu.effects.ts b/src/app/shared/menu/menu.effects.ts
new file mode 100644
index 00000000000..a9aa07daad4
--- /dev/null
+++ b/src/app/shared/menu/menu.effects.ts
@@ -0,0 +1,119 @@
+import { ActivatedRoute } from '@angular/router';
+import { MenuSection } from './menu.reducer';
+import { hasNoValue, hasValue } from '../empty.util';
+import { Actions, Effect, ofType } from '@ngrx/effects';
+import { MenuService } from './menu.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { Action } from '@ngrx/store';
+import { ROUTER_NAVIGATED } from '@ngrx/router-store';
+import { Injectable } from '@angular/core';
+import { map, take, tap } from 'rxjs/operators';
+import { MenuID } from './initial-menus-state';
+
+/**
+ * Effects modifying the state of menus
+ */
+@Injectable()
+export class MenuEffects {
+
+  /**
+   * On route change, build menu sections for every menu type depending on the current route data
+   */
+  @Effect({dispatch: false})
+  public buildRouteMenuSections$: Observable<Action> = this.actions$
+    .pipe(
+      ofType(ROUTER_NAVIGATED),
+      tap(() => {
+        Object.values(MenuID).forEach((menuID) => {
+          this.buildRouteMenuSections(menuID);
+        });
+      })
+    );
+
+  constructor(private actions$: Actions,
+              private menuService: MenuService,
+              private route: ActivatedRoute) {
+  }
+
+  /**
+   * Build menu sections depending on the current route
+   * - Adds sections found in the current route data that aren't active yet
+   * - Removes sections that are active, but not present in the current route data
+   * @param menuID  The menu to add/remove sections to/from
+   */
+  buildRouteMenuSections(menuID: MenuID) {
+    this.menuService.getNonPersistentMenuSections(menuID).pipe(
+      map((sections) => sections.map((section) => section.id)),
+      take(1)
+    ).subscribe((shouldNotPersistIDs: string[]) => {
+      const resolvedSections = this.resolveRouteMenuSections(this.route.root, menuID);
+      resolvedSections.forEach((section) => {
+        const index = shouldNotPersistIDs.indexOf(section.id);
+        if (index > -1) {
+          shouldNotPersistIDs.splice(index, 1);
+        } else {
+          this.menuService.addSection(menuID, section);
+        }
+      });
+      shouldNotPersistIDs.forEach((id) => {
+        this.menuService.removeSection(menuID, id);
+      });
+    });
+  }
+
+  /**
+   * Resolve menu sections defined in the current route data (including parent routes)
+   * @param route   The route to resolve data for
+   * @param menuID  The menu to resolve data for
+   */
+  resolveRouteMenuSections(route: ActivatedRoute, menuID: MenuID): MenuSection[] {
+    const data = route.snapshot.data;
+    const params = route.snapshot.params;
+    const last: boolean = hasNoValue(route.firstChild);
+
+    if (hasValue(data) && hasValue(data.menu) && hasValue(data.menu[menuID])) {
+
+      let menuSections: MenuSection[] | MenuSection = data.menu[menuID];
+      menuSections = this.resolveSubstitutions(menuSections, params);
+
+      if (!last) {
+        return [...menuSections, ...this.resolveRouteMenuSections(route.firstChild, menuID)]
+      } else {
+        return [...menuSections];
+      }
+    }
+
+    return !last ? this.resolveRouteMenuSections(route.firstChild, menuID) : [];
+  }
+
+  private resolveSubstitutions(object, params) {
+
+    let resolved;
+    if (typeof object === 'string') {
+      resolved = object;
+      let match: RegExpMatchArray;
+      do {
+        match = resolved.match(/:(\w+)/);
+        if (match) {
+          const substitute = params[match[1]];
+          if (hasValue(substitute)) {
+            resolved = resolved.replace(match[0], `${substitute}`);
+          }
+        }
+      } while (match);
+    } else if (Array.isArray(object)) {
+      resolved = [];
+      object.forEach((entry, index) => {
+        resolved[index] = this.resolveSubstitutions(object[index], params);
+      });
+    } else if (typeof object === 'object') {
+      resolved = {};
+      Object.keys(object).forEach((key) => {
+        resolved[key] = this.resolveSubstitutions(object[key], params);
+      });
+    } else {
+      resolved = object;
+    }
+    return resolved;
+  }
+}
diff --git a/src/app/shared/menu/menu.reducer.ts b/src/app/shared/menu/menu.reducer.ts
index 078343a9903..0ef328aa157 100644
--- a/src/app/shared/menu/menu.reducer.ts
+++ b/src/app/shared/menu/menu.reducer.ts
@@ -58,6 +58,7 @@ export class MenuSection {
   model: MenuItemModel;
   index?: number;
   icon?: string;
+  shouldPersistOnRouteChange? = false;
 }
 
 /**
@@ -176,7 +177,9 @@ function removeSection(state: MenusState, action: RemoveMenuSectionAction) {
   const menuState: MenuState = state[action.menuID];
   const id = action.id;
   const newState = removeFromIndex(state, menuState.sections[action.id], action.menuID);
-  const newMenuState = Object.assign({}, newState[action.menuID]);
+  const newMenuState = Object.assign({}, newState[action.menuID], {
+    sections: Object.assign({}, newState[action.menuID].sections)
+  });
   delete newMenuState.sections[id];
   return Object.assign({}, newState, { [action.menuID]: newMenuState });
 }
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index 95611daa212..fd3ba1ed5cd 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -19,7 +19,7 @@ import {
   ToggleActiveMenuSectionAction,
   ToggleMenuAction,
 } from './menu.actions';
-import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
+import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../empty.util';
 
 export function menuKeySelector<T>(key: string, selector): MemoizedSelector<MenuState, T> {
   return createSelector(selector, (state) => {
@@ -98,7 +98,7 @@ export class MenuService {
       switchMap((ids: string[]) =>
         observableCombineLatest(ids.map((id: string) => this.getMenuSection(menuID, id)))
       ),
-      map((sections: MenuSection[]) => sections.filter((section: MenuSection) => !mustBeVisible || section.visible))
+      map((sections: MenuSection[]) => sections.filter((section: MenuSection) => hasValue(section) && (!mustBeVisible || section.visible)))
     );
   }
 
@@ -129,6 +129,16 @@ export class MenuService {
     );
   }
 
+  /**
+   * Retrieve menu sections that shouldn't persist on route change
+   * @param menuID  The ID of the menu the sections reside in
+   */
+  getNonPersistentMenuSections(menuID: MenuID): Observable<MenuSection[]> {
+    return this.getMenu(menuID).pipe(
+      map((state: MenuState) => Object.values(state.sections).filter((section: MenuSection) => !section.shouldPersistOnRouteChange))
+    );
+  }
+
   /**
    * Add a new section to the store
    * @param {MenuID} menuID The menu to which the new section is to be added
@@ -270,7 +280,7 @@ export class MenuService {
    * @returns {Observable<boolean>} Emits true when the given section is currently active, false when the given section is currently inactive
    */
   isSectionActive(menuID: MenuID, id: string): Observable<boolean> {
-    return this.getMenuSection(menuID, id).pipe(map((section) => section.active));
+    return this.getMenuSection(menuID, id).pipe(hasValueOperator(), map((section) => section.active));
   }
 
   /**
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
index 86bede67896..fd094f77971 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
@@ -1,10 +1,11 @@
-import { Component, ComponentFactoryResolver, InjectionToken, Injector, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, ComponentFactoryResolver, Input, OnInit, ViewChild } from '@angular/core';
 import { MetadataRepresentation } from '../../core/shared/metadata-representation/metadata-representation.model';
 import { getMetadataRepresentationComponent } from './metadata-representation.decorator';
 import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
 import { MetadataRepresentationListElementComponent } from '../object-list/metadata-representation-list-element/metadata-representation-list-element.component';
 import { MetadataRepresentationDirective } from './metadata-representation.directive';
+import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-metadata-representation-loader',
@@ -15,10 +16,21 @@ import { MetadataRepresentationDirective } from './metadata-representation.direc
  * Component for determining what component to use depending on the item's relationship type (relationship.type), its metadata representation and, optionally, its context
  */
 export class MetadataRepresentationLoaderComponent implements OnInit {
+  private componentRefInstance: MetadataRepresentationListElementComponent;
+
   /**
    * The item or metadata to determine the component for
    */
-  @Input() mdRepresentation: MetadataRepresentation;
+  private _mdRepresentation: MetadataRepresentation;
+  get mdRepresentation(): MetadataRepresentation {
+    return this._mdRepresentation;
+  }
+  @Input() set mdRepresentation(nextValue: MetadataRepresentation) {
+    this._mdRepresentation = nextValue;
+    if (hasValue(this.componentRefInstance)) {
+      this.componentRefInstance.metadataRepresentation = nextValue;
+    }
+  }
 
   /**
    * The optional context
@@ -43,7 +55,8 @@ export class MetadataRepresentationLoaderComponent implements OnInit {
     viewContainerRef.clear();
 
     const componentRef = viewContainerRef.createComponent(componentFactory);
-    (componentRef.instance as MetadataRepresentationListElementComponent).metadataRepresentation = this.mdRepresentation;
+    this.componentRefInstance = componentRef.instance as MetadataRepresentationListElementComponent;
+    this.componentRefInstance.metadataRepresentation = this.mdRepresentation;
   }
 
   /**
diff --git a/src/app/shared/mocks/auth.service.mock.ts b/src/app/shared/mocks/auth.service.mock.ts
index a168ffd8e52..064af7dadec 100644
--- a/src/app/shared/mocks/auth.service.mock.ts
+++ b/src/app/shared/mocks/auth.service.mock.ts
@@ -1,4 +1,6 @@
 /* tslint:disable:no-empty */
+import { Observable, of as observableOf } from 'rxjs';
+
 export class AuthServiceMock {
   public checksAuthenticationToken() {
     return
@@ -6,4 +8,15 @@ export class AuthServiceMock {
   public buildAuthHeader() {
     return 'auth-header';
   }
+
+  public getShortlivedToken(): Observable<string> {
+    return observableOf('token');
+  }
+
+  public isAuthenticated(): Observable<boolean> {
+    return observableOf(true);
+  }
+
+  public setRedirectUrl(url: string) {
+  }
 }
diff --git a/src/app/shared/mocks/cookie.service.mock.ts b/src/app/shared/mocks/cookie.service.mock.ts
index f94f3d4a7d0..17e1b36981a 100644
--- a/src/app/shared/mocks/cookie.service.mock.ts
+++ b/src/app/shared/mocks/cookie.service.mock.ts
@@ -16,7 +16,8 @@ export class CookieServiceMock {
     return this.cookies.get(name);
   }
 
-  remove() {
+  remove(name) {
+    this.cookies.delete(name);
     return jasmine.createSpy('remove');
   }
 
diff --git a/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.spec.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
similarity index 100%
rename from src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.spec.ts
rename to src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
diff --git a/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
similarity index 75%
rename from src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts
rename to src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
index aa13b57d7b6..278a392e182 100644
--- a/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
@@ -4,8 +4,8 @@ import { Observable, of as observableOf } from 'rxjs';
 import { isEmpty } from '../../empty.util';
 import { RestRequestMethod } from '../../../core/data/rest-request-method';
 
-import { DSpaceRESTV2Response } from '../../../core/dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceRESTv2Service, HttpOptions } from '../../../core/dspace-rest-v2/dspace-rest-v2.service';
+import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model';
+import { DspaceRestService, HttpOptions } from '../../../core/dspace-rest/dspace-rest.service';
 import { MOCK_RESPONSE_MAP, ResponseMapMock } from './mocks/response-map.mock';
 import * as URL from 'url-parse';
 import { environment } from '../../../../environments/environment';
@@ -18,7 +18,7 @@ import { environment } from '../../../../environments/environment';
  * This is especially useful, when a REST endpoint is broken or does not exist yet
  */
 @Injectable()
-export class EndpointMockingRestService extends DSpaceRESTv2Service {
+export class EndpointMockingRestService extends DspaceRestService {
 
   constructor(
     @Inject(MOCK_RESPONSE_MAP) protected mockResponseMap: ResponseMapMock,
@@ -35,10 +35,10 @@ export class EndpointMockingRestService extends DSpaceRESTv2Service {
    *
    * @param absoluteURL
    *      A URL
-   * @return Observable<DSpaceRESTV2Response>
-   *      An Observable<DSpaceRESTV2Response> containing the response
+   * @return Observable<RawRestResponse>
+   *      An Observable<RawRestResponse> containing the response
    */
-  get(absoluteURL: string): Observable<DSpaceRESTV2Response> {
+  get(absoluteURL: string): Observable<RawRestResponse> {
     const mockData = this.getMockData(absoluteURL);
     if (isEmpty(mockData)) {
       return super.get(absoluteURL);
@@ -59,27 +59,27 @@ export class EndpointMockingRestService extends DSpaceRESTv2Service {
    *    the URL for the request
    * @param body
    *    an optional body for the request
-   * @return Observable<DSpaceRESTV2Response>
-   *      An Observable<DSpaceRESTV2Response> containing the response from the server
+   * @return Observable<RawRestResponse>
+   *      An Observable<RawRestResponse> containing the response from the server
    */
-  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions): Observable<DSpaceRESTV2Response> {
+  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions, isMultipart?: boolean): Observable<RawRestResponse> {
     const mockData = this.getMockData(url);
     if (isEmpty(mockData)) {
-      return super.request(method, url, body, options);
+      return super.request(method, url, body, options, isMultipart);
     } else {
       return this.toMockResponse$(mockData);
     }
   }
 
   /**
-   * Turn the mock object in to an Observable<DSpaceRESTV2Response>
+   * Turn the mock object in to an Observable<RawRestResponse>
    *
    * @param mockData
    *    the mock response
    * @return
-   *    an Observable<DSpaceRESTV2Response> containing the mock response
+   *    an Observable<RawRestResponse> containing the mock response
    */
-  private toMockResponse$(mockData: any): Observable<DSpaceRESTV2Response> {
+  private toMockResponse$(mockData: any): Observable<RawRestResponse> {
     return observableOf({
       payload: mockData,
       headers: new HttpHeaders(),
diff --git a/src/app/shared/mocks/dspace-rest-v2/mocks/mock-submission-response.json b/src/app/shared/mocks/dspace-rest/mocks/mock-submission-response.json
similarity index 100%
rename from src/app/shared/mocks/dspace-rest-v2/mocks/mock-submission-response.json
rename to src/app/shared/mocks/dspace-rest/mocks/mock-submission-response.json
diff --git a/src/app/shared/mocks/dspace-rest-v2/mocks/response-map.mock.ts b/src/app/shared/mocks/dspace-rest/mocks/response-map.mock.ts
similarity index 88%
rename from src/app/shared/mocks/dspace-rest-v2/mocks/response-map.mock.ts
rename to src/app/shared/mocks/dspace-rest/mocks/response-map.mock.ts
index 84762178358..94ea68a385b 100644
--- a/src/app/shared/mocks/dspace-rest-v2/mocks/response-map.mock.ts
+++ b/src/app/shared/mocks/dspace-rest/mocks/response-map.mock.ts
@@ -1,5 +1,5 @@
 import { InjectionToken } from '@angular/core';
-import mockSubmissionResponse from './mock-submission-response.json';
+// import mockSubmissionResponse from './mock-submission-response.json';
 
 export class ResponseMapMock extends Map<string, any> {};
 
diff --git a/src/app/shared/mocks/external-source.service.mock.ts b/src/app/shared/mocks/external-source.service.mock.ts
new file mode 100644
index 00000000000..fd6d7cdc461
--- /dev/null
+++ b/src/app/shared/mocks/external-source.service.mock.ts
@@ -0,0 +1,58 @@
+import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSource } from '../../core/shared/external-source.model';
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const externalSourceOrcid: ExternalSource = {
+  type: new ResourceType('externalsource'),
+  id: 'orcid',
+  name: 'orcid',
+  hierarchical: false,
+  _links: {
+    entries: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid/entries'
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid'
+    }
+  }
+};
+
+export const externalSourceCiencia: ExternalSource = {
+  type: new ResourceType('externalsource'),
+  id: 'ciencia',
+  name: 'ciencia',
+  hierarchical: false,
+  _links: {
+    entries: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia/entries'
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia'
+    }
+  }
+};
+
+export const externalSourceMyStaffDb: ExternalSource = {
+  type: new ResourceType('externalsource'),
+  id: 'my_staff_db',
+  name: 'my_staff_db',
+  hierarchical: false,
+  _links: {
+    entries: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entries'
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db'
+    }
+  }
+};
+
+/**
+ * Mock for [[ExternalSourceService]]
+ */
+export function getMockExternalSourceService(): ExternalSourceService {
+  return jasmine.createSpyObj('ExternalSourceService', {
+    findAll: jasmine.createSpy('findAll'),
+    getExternalSourceEntries: jasmine.createSpy('getExternalSourceEntries'),
+  });
+}
diff --git a/src/app/shared/mocks/form-models.mock.ts b/src/app/shared/mocks/form-models.mock.ts
index e4f9ec31314..739de944f09 100644
--- a/src/app/shared/mocks/form-models.mock.ts
+++ b/src/app/shared/mocks/form-models.mock.ts
@@ -1,16 +1,19 @@
+import { DynamicSelectModel } from '@ng-dynamic-forms/core';
+
 import { DsDynamicInputModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DynamicQualdropModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { DynamicRowArrayModel, DynamicRowArrayModelConfig } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { DynamicSelectModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicRowArrayModel,
+  DynamicRowArrayModelConfig
+} from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
 import { DynamicRelationGroupModel } from '../form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormFieldModel } from '../form/builder/models/form-field.model';
-import { AuthorityOptions } from '../../core/integration/models/authority-options.model';
-import { AuthorityValue } from '../../core/integration/models/authority.value';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
 import { DynamicRowGroupModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { FormRowModel } from '../../core/config/models/config-submission-form.model';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 
 export const qualdropSelectConfig = {
   name: 'dc.identifier_QUALDROP_METADATA',
@@ -56,7 +59,8 @@ export const qualdropInputConfig = {
   repeatable: false,
   value: 'test',
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockQualdropSelectModel = new DynamicSelectModel(qualdropSelectConfig);
@@ -76,10 +80,15 @@ const rowArrayQualdropConfig = {
   id: 'row_QUALDROP_GROUP',
   initialCount: 1,
   notRepeatable: true,
+  relationshipConfig: undefined,
   groupFactory: () => {
     return [MockQualdropModel];
   },
-  required: false
+  required: false,
+  submissionId: '1234',
+  metadataKey: 'dc.some.key',
+  metadataFields: ['dc.some.key'],
+  hasSelectableMetadata: false
 } as DynamicRowArrayModelConfig;
 
 export const MockRowArrayQualdropModel: DynamicRowArrayModel = new DynamicRowArrayModel(rowArrayQualdropConfig);
@@ -87,7 +96,7 @@ export const MockRowArrayQualdropModel: DynamicRowArrayModel = new DynamicRowArr
 const mockFormRowModel = {
   fields: [
     {
-      input: {type: 'lookup'},
+      input: { type: 'lookup' },
       label: 'Journal',
       mandatory: 'false',
       repeatable: false,
@@ -95,14 +104,14 @@ const mockFormRowModel = {
       selectableMetadata: [
         {
           metadata: 'journal',
-          authority: 'JOURNALAuthority',
+          controlledVocabulary: 'JOURNALAuthority',
           closed: false
         }
       ],
       languageCodes: []
     } as FormFieldModel,
     {
-      input: {type: 'onebox'},
+      input: { type: 'onebox' },
       label: 'Issue',
       mandatory: 'false',
       repeatable: false,
@@ -136,13 +145,14 @@ const relationGroupConfig = {
       'issue test 2'
     ],
   },
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const MockRelationModel: DynamicRelationGroupModel = new DynamicRelationGroupModel(relationGroupConfig);
 
 export const inputWithLanguageAndAuthorityConfig = {
-  authorityOptions: new AuthorityOptions('testAuthority', 'testWithAuthority', 'scope'),
+  vocabularyOptions: new VocabularyOptions('testAuthority', false),
   languageCodes: [
     {
       display: 'English',
@@ -159,13 +169,14 @@ export const inputWithLanguageAndAuthorityConfig = {
   readOnly: false,
   disabled: false,
   repeatable: false,
-  value:  {
+  value: {
     value: 'testWithLanguageAndAuthority',
     display: 'testWithLanguageAndAuthority',
-    id: 'testWithLanguageAndAuthority',
+    authority: 'testWithLanguageAndAuthority',
   },
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockInputWithLanguageAndAuthorityModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityConfig);
@@ -189,13 +200,14 @@ export const inputWithLanguageConfig = {
   repeatable: false,
   value: 'testWithLanguage',
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockInputWithLanguageModel = new DsDynamicInputModel(inputWithLanguageConfig);
 
 export const inputWithLanguageAndAuthorityArrayConfig = {
-  authorityOptions: new AuthorityOptions('testAuthority', 'testWithAuthority', 'scope'),
+  vocabularyOptions: new VocabularyOptions('testAuthority', false),
   languageCodes: [
     {
       display: 'English',
@@ -215,10 +227,11 @@ export const inputWithLanguageAndAuthorityArrayConfig = {
   value: [{
     value: 'testLanguageAndAuthorityArray',
     display: 'testLanguageAndAuthorityArray',
-    id: 'testLanguageAndAuthorityArray',
+    authority: 'testLanguageAndAuthorityArray',
   }],
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockInputWithLanguageAndAuthorityArrayModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityArrayConfig);
@@ -231,7 +244,8 @@ export const inputWithFormFieldValueConfig = {
   repeatable: false,
   value: new FormFieldMetadataValueObject('testWithFormFieldValue'),
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockInputWithFormFieldValueModel = new DsDynamicInputModel(inputWithFormFieldValueConfig);
@@ -242,9 +256,14 @@ export const inputWithAuthorityValueConfig = {
   readOnly: false,
   disabled: false,
   repeatable: false,
-  value: Object.assign({}, new AuthorityValue(), { value: 'testWithAuthorityValue', id: 'testWithAuthorityValue', display: 'testWithAuthorityValue' }),
+  value: Object.assign({}, new VocabularyEntry(), {
+    value: 'testWithAuthorityValue',
+    authority: 'testWithAuthorityValue',
+    display: 'testWithAuthorityValue'
+  }),
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockInputWithAuthorityValueModel = new DsDynamicInputModel(inputWithAuthorityValueConfig);
@@ -255,9 +274,10 @@ export const inputWithObjectValueConfig = {
   readOnly: false,
   disabled: false,
   repeatable: false,
-  value: { value: 'testWithObjectValue', id: 'testWithObjectValue', display: 'testWithObjectValue' },
+  value: { value: 'testWithObjectValue', authority: 'testWithObjectValue', display: 'testWithObjectValue' },
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockInputWithObjectValueModel = new DsDynamicInputModel(inputWithObjectValueConfig);
@@ -274,7 +294,8 @@ export const fileFormEditInputConfig = {
   disabled: false,
   repeatable: false,
   submissionId: '1234',
-  metadataFields: []
+  metadataFields: [],
+  hasSelectableMetadata: false
 };
 
 export const mockFileFormEditInputModel = new DsDynamicInputModel(fileFormEditInputConfig);
diff --git a/src/app/shared/mocks/mock-resource-policy-service.ts b/src/app/shared/mocks/mock-resource-policy-service.ts
new file mode 100644
index 00000000000..864cf20730e
--- /dev/null
+++ b/src/app/shared/mocks/mock-resource-policy-service.ts
@@ -0,0 +1,10 @@
+import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+
+export function getMockResourcePolicyService(): ResourcePolicyService {
+  return jasmine.createSpyObj('resourcePolicyService', {
+    searchByResource: jasmine.createSpy('searchByResource'),
+    create: jasmine.createSpy('create'),
+    delete: jasmine.createSpy('delete'),
+    update: jasmine.createSpy('update')
+  });
+}
diff --git a/src/app/shared/mocks/object-cache.service.mock.ts b/src/app/shared/mocks/object-cache.service.mock.ts
index 9e35a519ffb..144c82fe160 100644
--- a/src/app/shared/mocks/object-cache.service.mock.ts
+++ b/src/app/shared/mocks/object-cache.service.mock.ts
@@ -5,12 +5,13 @@ export function getMockObjectCacheService(): ObjectCacheService {
     'add',
     'remove',
     'getByUUID',
-    'getBySelfLink',
+    'getByHref',
+    'getObjectByHref',
     'getRequestHrefBySelfLink',
     'getRequestHrefByUUID',
     'getList',
     'hasByUUID',
-    'hasBySelfLink'
+    'hasByHref'
   ]);
 
 }
diff --git a/src/app/shared/mocks/remote-data-build.service.mock.ts b/src/app/shared/mocks/remote-data-build.service.mock.ts
index fa30282d6b4..1b470d692b9 100644
--- a/src/app/shared/mocks/remote-data-build.service.mock.ts
+++ b/src/app/shared/mocks/remote-data-build.service.mock.ts
@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { RequestEntry } from '../../core/data/request.reducer';
 import { PageInfo } from '../../core/shared/page-info.model';
@@ -25,9 +25,10 @@ export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observab
       if (hasValue(buildList$)) {
         return buildList$;
       } else {
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []))
       }
-    }
+    },
+    buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({})
   } as RemoteDataBuildService;
 
 }
@@ -50,7 +51,7 @@ export function getMockRemoteDataBuildServiceHrefMap(toRemoteDataObservable$?: O
         if (hasValue(buildListHrefMap$[href$])) {
           return buildListHrefMap$[href$];
         } else {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []))
         }
       }
       href$.pipe(
@@ -58,11 +59,12 @@ export function getMockRemoteDataBuildServiceHrefMap(toRemoteDataObservable$?: O
           if (hasValue(buildListHrefMap$[href])) {
             return buildListHrefMap$[href];
           } else {
-            return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+            return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []))
           }
         })
       );
-    }
+    },
+    buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({})
   } as RemoteDataBuildService;
 
 }
diff --git a/src/app/shared/mocks/request.service.mock.ts b/src/app/shared/mocks/request.service.mock.ts
index da297f56aca..aebc3c1b1fa 100644
--- a/src/app/shared/mocks/request.service.mock.ts
+++ b/src/app/shared/mocks/request.service.mock.ts
@@ -11,7 +11,8 @@ export function getMockRequestService(requestEntry$: Observable<RequestEntry> =
     getByUUID: requestEntry$,
     uriEncodeBody: jasmine.createSpy('uriEncodeBody'),
     isCachedOrPending: false,
-    removeByHrefSubstring: jasmine.createSpy('removeByHrefSubstring'),
-    hasByHrefObservable: observableOf(false)
+    removeByHrefSubstring: observableOf(true),
+    setStaleByHrefSubstring: observableOf(true),
+    hasByHref$: observableOf(false)
   });
 }
diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts
index 082eec4c711..1fb5dcd1b3d 100644
--- a/src/app/shared/mocks/submission.mock.ts
+++ b/src/app/shared/mocks/submission.mock.ts
@@ -1,9 +1,10 @@
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { Group } from '../../core/eperson/models/group.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { SubmissionObjectState } from '../../submission/objects/submission-objects.reducer';
 import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 export const mockSectionsData = {
   traditionalpageone: {
@@ -59,6 +60,21 @@ export const mockSectionsErrors = [
   }
 ];
 
+export const mockSectionsErrorsTwo = [
+  {
+    message: 'error.validation.required',
+    paths: [
+      '/sections/traditionalpageone/dc.title',
+    ]
+  },
+  {
+    message: 'error.validation.license.notgranted',
+    paths: [
+      '/sections/license'
+    ]
+  }
+];
+
 export const mockUploadResponse1Errors = {
   errors: [
     {
@@ -905,7 +921,7 @@ export const mockSubmissionDefinitionResponse = {
 
 export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
   isDefault: true,
-  sections: new PaginatedList(new PageInfo(), [
+  sections: buildPaginatedList(new PageInfo(), [
     {
       mandatory: true,
       sectionType: 'utils',
@@ -1032,6 +1048,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         enabled: true,
         data: {},
         errors: [],
+        formId: '2_traditionalpageone',
         isLoading: false,
         isValid: false
       } as any,
@@ -1208,6 +1225,61 @@ export const mockSectionsList = [
   }
 ];
 
+export const mockUploadConfigResponseMetadata = {
+  rows: [
+    {
+      fields: [
+        {
+          input: {
+            type: 'onebox'
+          },
+          label: 'Title',
+          mandatory: true,
+          repeatable: false,
+          mandatoryMessage: 'You must enter a main title for this item.',
+          hints: 'Enter the name of the file.',
+          selectableMetadata: [
+            {
+              metadata: 'dc.title',
+              label: null,
+              controlledVocabulary: null,
+              closed: null
+            }
+          ],
+          languageCodes: []
+        }
+      ]
+    },
+    {
+      fields: [
+        {
+          input: {
+            type: 'textarea'
+          },
+          label: 'Description',
+          mandatory: false,
+          repeatable: true,
+          hints: 'Enter a description for the file',
+          selectableMetadata: [
+            {
+              metadata: 'dc.description',
+              label: null,
+              controlledVocabulary: null,
+              closed: null
+            }
+          ],
+          languageCodes: []
+        }
+      ]
+    }
+  ],
+  name: 'bitstream-metadata',
+  type: 'submissionform',
+  _links: {
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' }
+  },
+}
+
 export const mockUploadConfigResponse = {
   accessConditionOptions: [
     {
@@ -1237,60 +1309,7 @@ export const mockUploadConfigResponse = {
       hasEndDate: false
     }
   ],
-  metadata: {
-    rows: [
-      {
-        fields: [
-          {
-            input: {
-              type: 'onebox'
-            },
-            label: 'Title',
-            mandatory: true,
-            repeatable: false,
-            mandatoryMessage: 'You must enter a main title for this item.',
-            hints: 'Enter the name of the file.',
-            selectableMetadata: [
-              {
-                metadata: 'dc.title',
-                label: null,
-                authority: null,
-                closed: null
-              }
-            ],
-            languageCodes: []
-          }
-        ]
-      },
-      {
-        fields: [
-          {
-            input: {
-              type: 'textarea'
-            },
-            label: 'Description',
-            mandatory: false,
-            repeatable: true,
-            hints: 'Enter a description for the file',
-            selectableMetadata: [
-              {
-                metadata: 'dc.description',
-                label: null,
-                authority: null,
-                closed: null
-              }
-            ],
-            languageCodes: []
-          }
-        ]
-      }
-    ],
-    name: 'bitstream-metadata',
-    type: 'submissionform',
-    _links: {
-      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' }
-    },
-  },
+  metadata: createSuccessfulRemoteDataObject$(mockUploadConfigResponseMetadata),
   required: true,
   maxSize: 536870912,
   name: 'upload',
@@ -1302,8 +1321,7 @@ export const mockUploadConfigResponse = {
 };
 
 // Clone the object and change one property
-export const mockUploadConfigResponseNotRequired = JSON.parse(JSON.stringify(mockUploadConfigResponse));
-mockUploadConfigResponseNotRequired.required = false;
+export const mockUploadConfigResponseNotRequired = Object.assign({}, mockUploadConfigResponse, { required: false });
 
 export const mockAccessConditionOptions = [
   {
diff --git a/src/app/shared/mocks/translate.service.mock.ts b/src/app/shared/mocks/translate.service.mock.ts
index 8106b3788f5..0bc172b408d 100644
--- a/src/app/shared/mocks/translate.service.mock.ts
+++ b/src/app/shared/mocks/translate.service.mock.ts
@@ -3,6 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 export function getMockTranslateService(): TranslateService {
   return jasmine.createSpyObj('translateService', {
     get: jasmine.createSpy('get'),
-    instant: jasmine.createSpy('instant')
+    instant: jasmine.createSpy('instant'),
+    setDefaultLang: jasmine.createSpy('setDefaultLang')
   });
 }
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
index 6e7f7bf65b3..1ec83e6207d 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
@@ -15,7 +15,11 @@ import { Item } from '../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../remote-data.utils';
 import { RequestService } from '../../../core/data/request.service';
 import { getMockRequestService } from '../../mocks/request.service.mock';
 import { getMockSearchService } from '../../mocks/search-service.mock';
@@ -148,7 +152,7 @@ describe('WorkspaceitemActionsComponent', () => {
 
   it('should display a success notification on delete success', async(() => {
     spyOn((component as any).modalService, 'open').and.returnValue({result: Promise.resolve('ok')});
-    mockDataService.delete.and.returnValue(observableOf(true));
+    mockDataService.delete.and.returnValue(createSuccessfulRemoteDataObject$({}));
     spyOn(component, 'reload');
 
     component.confirmDiscard('ok');
@@ -161,7 +165,7 @@ describe('WorkspaceitemActionsComponent', () => {
 
   it('should display an error notification on delete failure', async(() => {
     spyOn((component as any).modalService, 'open').and.returnValue({result: Promise.resolve('ok')});
-    mockDataService.delete.and.returnValue(observableOf(false));
+    mockDataService.delete.and.returnValue(createFailedRemoteDataObject$('Error', 500));
     spyOn(component, 'reload');
 
     component.confirmDiscard('ok');
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index 27512d899e0..8a2b19a93e8 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -11,6 +11,9 @@ import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem
 import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { NoContent } from '../../../core/shared/NoContent.model';
 
 /**
  * This component represents actions related to WorkspaceItem object.
@@ -63,9 +66,10 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
         if (result === 'ok') {
           this.processingDelete$.next(true);
           this.objectDataService.delete(this.object.id)
-            .subscribe((response: boolean) => {
+            .pipe(getFirstCompletedRemoteData())
+            .subscribe((response: RemoteData<NoContent>) => {
               this.processingDelete$.next(false);
-              this.handleActionResponse(response);
+              this.handleActionResponse(response.hasSucceeded);
             })
         }
       }
diff --git a/src/app/shared/ng-for-track-by-id.directive.ts b/src/app/shared/ng-for-track-by-id.directive.ts
new file mode 100644
index 00000000000..22343df750f
--- /dev/null
+++ b/src/app/shared/ng-for-track-by-id.directive.ts
@@ -0,0 +1,16 @@
+import { Directive, Host } from '@angular/core';
+import { NgForOf } from '@angular/common';
+
+import { DSpaceObject } from '../core/shared/dspace-object.model';
+
+@Directive({
+  // tslint:disable-next-line:directive-selector
+  selector: '[ngForTrackById]',
+})
+export class NgForTrackByIdDirective<T extends DSpaceObject> {
+
+  constructor(@Host() private ngFor: NgForOf<T>) {
+    this.ngFor.ngForTrackBy = (index: number, dso: T) => (dso) ? dso.id : undefined;
+  }
+
+}
diff --git a/src/app/shared/notifications/notifications.service.ts b/src/app/shared/notifications/notifications.service.ts
index fa65d695307..ab21ab61f7e 100644
--- a/src/app/shared/notifications/notifications.service.ts
+++ b/src/app/shared/notifications/notifications.service.ts
@@ -75,7 +75,7 @@ export class NotificationsService {
     this.translate.get(hrefTranslateLabel)
       .pipe(first())
       .subscribe((hrefMsg) => {
-        const anchor = `<a class="btn btn-link p-0 m-0" href="${href}" >
+        const anchor = `<a class="align-baseline btn btn-link p-0 m-0" href="${href}" >
                         <strong>${hrefMsg}</strong>
                       </a>`;
         const interpolateParams = Object.create({});
diff --git a/src/app/shared/object-collection/object-collection.component.spec.ts b/src/app/shared/object-collection/object-collection.component.spec.ts
index 7ba8328495b..4d23600603a 100644
--- a/src/app/shared/object-collection/object-collection.component.spec.ts
+++ b/src/app/shared/object-collection/object-collection.component.spec.ts
@@ -33,8 +33,8 @@ describe('ObjectCollectionComponent', () => {
   beforeEach(async(() => {
     fixture = TestBed.createComponent(ObjectCollectionComponent);
     objectCollectionComponent = fixture.componentInstance;
-
   }));
+
   it('should only show the grid component when the viewmode is set to grid', () => {
     objectCollectionComponent.currentMode$ = observableOf(ViewMode.GridElement);
 
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index f39bf07123c..ffb5c42880c 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -12,7 +12,7 @@ import { ListableObject } from './shared/listable-object.model';
 import { isNotEmpty } from '../empty.util';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { CollectionElementLinkType } from './collection-element-link.type';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Context } from '../../core/shared/context.model';
 
 /**
diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
index ca3b0866539..921999b5404 100644
--- a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
@@ -1,4 +1,4 @@
-<div class="d-inline-block mr-2">
+<div class="mr-2">
   <button (click)="importObject.emit(object)"
           class="btn btn-outline-primary btn-sm float-left"
           title="{{importConfig?.buttonLabel | translate}}">
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
index ef9a817424c..9ed4e9eaa83 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
@@ -1 +1,9 @@
-<ng-template dsListableObject></ng-template>
\ No newline at end of file
+<div [ngClass]="{'d-none' : hideBadges}" #badges>
+  <div *ngIf="privateBadge" class="private-badge">
+    <span class="badge badge-danger">{{ "item.badge.private" | translate }}</span>
+  </div>
+  <div *ngIf="withdrawnBadge" class="withdrawn-badge">
+    <span class="badge badge-warning">{{ "item.badge.withdrawn" | translate }}</span>
+  </div>
+</div>
+<ng-template dsListableObject></ng-template>
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index e2d9b17f1c5..f2b4d4f36be 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -6,9 +6,12 @@ import { GenericConstructor } from '../../../../core/shared/generic-constructor'
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import * as listableObjectDecorators from './listable-object.decorator';
-import { PublicationListElementComponent } from '../../../object-list/item-list-element/item-types/publication/publication-list-element.component';
+import { ItemListElementComponent } from '../../../object-list/item-list-element/item-types/item/item-list-element.component';
 import { ListableObjectDirective } from './listable-object.directive';
 import { spyOnExported } from '../../../testing/utils.test';
+import { TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { Item } from '../../../../core/shared/item.model';
 
 const testType = 'TestType';
 const testContext = Context.Search;
@@ -26,14 +29,14 @@ describe('ListableObjectComponentLoaderComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [],
-      declarations: [ListableObjectComponentLoaderComponent, PublicationListElementComponent, ListableObjectDirective],
+      imports: [TranslateModule.forRoot()],
+      declarations: [ListableObjectComponentLoaderComponent, ItemListElementComponent, ListableObjectDirective],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [ComponentFactoryResolver]
     }).overrideComponent(ListableObjectComponentLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [PublicationListElementComponent]
+        entryComponents: [ItemListElementComponent]
       }
     }).compileComponents();
   }));
@@ -45,7 +48,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
     comp.object = new TestType();
     comp.viewMode = testViewMode;
     comp.context = testContext;
-    spyOnExported(listableObjectDecorators, 'getListableObjectComponent').and.returnValue(PublicationListElementComponent);
+    spyOnExported(listableObjectDecorators, 'getListableObjectComponent').and.returnValue(ItemListElementComponent);
     fixture.detectChanges();
 
   }));
@@ -55,4 +58,63 @@ describe('ListableObjectComponentLoaderComponent', () => {
       expect(listableObjectDecorators.getListableObjectComponent).toHaveBeenCalledWith([testType], testViewMode, testContext);
     })
   });
+
+  describe('when the object is an item and viewMode is a list', () => {
+    beforeEach(() => {
+      comp.object = Object.assign(new Item());
+      comp.viewMode = ViewMode.ListElement;
+    });
+
+    describe('when the item is not withdrawn', () => {
+      beforeEach(() => {
+        (comp.object as any).isWithdrawn = false;
+        comp.initBadges();
+        fixture.detectChanges();
+      });
+
+      it('should not show the withdrawn badge', () => {
+        const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+        expect(badge).toBeNull();
+      });
+    });
+
+    describe('when the item is withdrawn', () => {
+      beforeEach(() => {
+        (comp.object as any).isWithdrawn = true;
+        comp.initBadges();
+        fixture.detectChanges();
+      });
+
+      it('should show the withdrawn badge', () => {
+        const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+        expect(badge).not.toBeNull();
+      });
+    });
+
+    describe('when the item is not private', () => {
+      beforeEach(() => {
+        (comp.object as any).isDiscoverable = true;
+        comp.initBadges();
+        fixture.detectChanges();
+      });
+      it('should not show the private badge', () => {
+        const badge = fixture.debugElement.query(By.css('div.private-badge'));
+        expect(badge).toBeNull();
+      });
+    });
+
+    describe('when the item is private', () => {
+      beforeEach(() => {
+        (comp.object as any).isDiscoverable = false;
+        comp.initBadges();
+        fixture.detectChanges();
+      });
+
+      it('should show the private badge', () => {
+        const badge = fixture.debugElement.query(By.css('div.private-badge'));
+        expect(badge).not.toBeNull();
+      });
+    });
+  });
+
 });
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
index 4e6e206ddd5..b046dc6ec76 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
@@ -1,4 +1,4 @@
-import { Component, ComponentFactoryResolver, ContentChild, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, ComponentFactoryResolver, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
 import { ListableObject } from '../listable-object.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Context } from '../../../../core/shared/context.model';
@@ -6,6 +6,7 @@ import { getListableObjectComponent } from './listable-object.decorator';
 import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { ListableObjectDirective } from './listable-object.directive';
 import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { hasValue } from '../../../empty.util';
 
 @Component({
   selector: 'ds-listable-object-component-loader',
@@ -46,11 +47,42 @@ export class ListableObjectComponentLoaderComponent implements OnInit {
    */
   @Input() listID: string;
 
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
+  /**
+   * Whether or not informational badges (e.g. Private, Withdrawn) should be hidden
+   */
+  @Input() hideBadges = false;
+
   /**
    * Directive hook used to place the dynamic child component
    */
   @ViewChild(ListableObjectDirective, {static: true}) listableObjectDirective: ListableObjectDirective;
 
+  /**
+   * View on the badges template, to be passed on to the loaded component (which will place the badges in the desired
+   * location, or on top if not specified)
+   */
+  @ViewChild('badges', { static: true }) badges: ElementRef;
+
+  /**
+   * Whether or not the "Private" badge should be displayed for this listable object
+   */
+  privateBadge = false;
+
+  /**
+   * Whether or not the "Withdrawn" badge should be displayed for this listable object
+   */
+  withdrawnBadge = false;
+
   constructor(private componentFactoryResolver: ComponentFactoryResolver) {
   }
 
@@ -58,16 +90,41 @@ export class ListableObjectComponentLoaderComponent implements OnInit {
    * Setup the dynamic child component
    */
   ngOnInit(): void {
+    this.initBadges();
+
     const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
 
     const viewContainerRef = this.listableObjectDirective.viewContainerRef;
     viewContainerRef.clear();
 
-    const componentRef = viewContainerRef.createComponent(componentFactory);
+    const componentRef = viewContainerRef.createComponent(
+      componentFactory,
+      0,
+      undefined,
+      [
+        [this.badges.nativeElement],
+      ]);
     (componentRef.instance as any).object = this.object;
     (componentRef.instance as any).index = this.index;
     (componentRef.instance as any).linkType = this.linkType;
     (componentRef.instance as any).listID = this.listID;
+    (componentRef.instance as any).showLabel = this.showLabel;
+    (componentRef.instance as any).context = this.context;
+    (componentRef.instance as any).viewMode = this.viewMode;
+    (componentRef.instance as any).value = this.value;
+  }
+
+  /**
+   * Initialize which badges should be visible in the listable component
+   */
+  initBadges() {
+    let objectAsAny = this.object as any;
+    if (hasValue(objectAsAny.indexableObject)) {
+      objectAsAny = objectAsAny.indexableObject;
+    }
+    const objectExistsAndValidViewMode = hasValue(objectAsAny) && this.viewMode !== ViewMode.StandalonePage;
+    this.privateBadge = objectExistsAndValidViewMode && hasValue(objectAsAny.isDiscoverable) && !objectAsAny.isDiscoverable;
+    this.withdrawnBadge = objectExistsAndValidViewMode && hasValue(objectAsAny.isWithdrawn) && objectAsAny.isWithdrawn;
   }
 
   /**
diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
index 3602f45ede3..2c944b92cee 100644
--- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
+++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
@@ -24,11 +24,31 @@ export class AbstractListableElementComponent<T extends ListableObject> {
    */
   @Input() listID: string;
 
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
   /**
    * The index of this element
    */
   @Input() index: number;
 
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * The context we matched on to get this component
+   */
+  @Input() context: Context;
+
+  /**
+   * The viewmode we matched on to get this component
+   */
+  @Input() viewMode: ViewMode;
+
   /**
    * The available link types
    */
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
index 92d85d03f45..56a83913a76 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -4,7 +4,7 @@
            [id]="'object' + index"
            [ngModel]="selected$ | async"
            (ngModelChange)="selectCheckbox($event)">
-    <input *ngIf="!selectionConfig.repeatable" class="form-check-input" type="radio"
+    <input *ngIf="!selectionConfig.repeatable" class="form-check-input mt-2" type="radio"
            [name]="'radio' + index"
            [id]="'object' + index"
            [checked]="selected$ | async"
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
index 62e222e4613..dd365de86c0 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
@@ -5,7 +5,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
@@ -13,14 +13,13 @@ import { BitstreamDataService } from '../../../../core/data/bitstream-data.servi
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { FindListOptions } from '../../../../core/data/request.models';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { FileService } from '../../../../core/shared/file.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
@@ -32,6 +31,7 @@ import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { VarDirective } from '../../../utils/var.directive';
 import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field/item-detail-preview-field.component';
 import { ItemDetailPreviewComponent } from './item-detail-preview.component';
+import { createPaginatedList } from '../../../testing/utils.test';
 
 function getMockFileService(): FileService {
   return jasmine.createSpyObj('FileService', {
@@ -44,7 +44,7 @@ let component: ItemDetailPreviewComponent;
 let fixture: ComponentFixture<ItemDetailPreviewComponent>;
 
 const mockItem: Item = Object.assign(new Item(), {
-  bundles: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), []))),
+  bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: {
     'dc.contributor.author': [
       {
@@ -79,7 +79,7 @@ describe('ItemDetailPreviewComponent', () => {
       return createSuccessfulRemoteDataObject$(new Bitstream());
     },
     findAllByItemAndBundleName(item: Item, bundleName: string, options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
-      return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []));
+      return createSuccessfulRemoteDataObject$(createPaginatedList([]));
     },
   };
   beforeEach(async(() => {
diff --git a/src/app/shared/object-detail/object-detail.component.spec.ts b/src/app/shared/object-detail/object-detail.component.spec.ts
index 558d68048ca..c858387f7ef 100644
--- a/src/app/shared/object-detail/object-detail.component.spec.ts
+++ b/src/app/shared/object-detail/object-detail.component.spec.ts
@@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser';
 import { ObjectDetailComponent } from './object-detail.component';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
@@ -28,7 +28,7 @@ describe('ObjectDetailComponent', () => {
     Object.assign (new DSpaceObject(), { ten: 10 }),
   ];
   const pageInfo = Object.assign(new PageInfo(), {elementsPerPage: 1, totalElements: 10, totalPages: 10, currentPage: 1});
-  const mockRD = createSuccessfulRemoteDataObject(new PaginatedList(pageInfo, testObjects));
+  const mockRD = createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, testObjects));
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts
index 45efb4a0b7e..8b94746fbd8 100644
--- a/src/app/shared/object-detail/object-detail.component.ts
+++ b/src/app/shared/object-detail/object-detail.component.ts
@@ -8,7 +8,7 @@ import {
 } from '@angular/core';
 
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { fadeIn } from '../animations/fade';
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
index 0b1a85d0ef5..9b9d1747040 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
@@ -1,10 +1,10 @@
 <div class="card">
   <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', object.id]" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="object.logo">
+    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
     </ds-grid-thumbnail>
   </a>
   <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="object.logo">
+    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
     </ds-grid-thumbnail>
   </span>
   <div class="card-body">
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
index 66807c6b209..efd4d0645c4 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
@@ -3,6 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { Collection } from '../../../core/shared/collection.model';
+import { LinkService } from '../../../core/cache/builders/link.service';
 
 let collectionGridElementComponent: CollectionGridElementComponent;
 let fixture: ComponentFixture<CollectionGridElementComponent>;
@@ -29,12 +30,17 @@ const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection()
   }
 });
 
+const linkService = jasmine.createSpyObj('linkService', {
+  resolveLink: mockCollectionWithAbstract
+});
+
 describe('CollectionGridElementComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ CollectionGridElementComponent ],
       providers: [
-        { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract)}
+        { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract)},
+        { provide: LinkService, useValue: linkService}
       ],
 
       schemas: [ NO_ERRORS_SCHEMA ]
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
index 6f8bf5264ed..bbb729d0ca1 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -1,9 +1,11 @@
-import { Component, Inject } from '@angular/core';
-
+import { Component, Input } from '@angular/core';
 import { Collection } from '../../../core/shared/collection.model';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { hasNoValue, hasValue } from '../../empty.util';
+import { followLink } from '../../utils/follow-link-config.model';
+import { LinkService } from '../../../core/cache/builders/link.service';
 
 /**
  * Component representing a grid element for collection
@@ -11,8 +13,29 @@ import { listableObjectComponent } from '../../object-collection/shared/listable
 @Component({
   selector: 'ds-collection-grid-element',
   styleUrls: ['./collection-grid-element.component.scss'],
-  templateUrl: './collection-grid-element.component.html'
+  templateUrl: './collection-grid-element.component.html',
 })
-
 @listableObjectComponent(Collection, ViewMode.GridElement)
-export class CollectionGridElementComponent extends AbstractListableElementComponent<Collection> {}
+export class CollectionGridElementComponent extends AbstractListableElementComponent<
+  Collection
+> {
+  private _object: Collection;
+
+  constructor(private linkService: LinkService) {
+    super();
+  }
+
+  @Input() set object(object: Collection) {
+    this._object = object;
+    if (hasValue(this._object) && hasNoValue(this._object.logo)) {
+      this.linkService.resolveLink<Collection>(
+        this._object,
+        followLink('logo')
+      );
+    }
+  }
+
+  get object(): Collection {
+    return this._object;
+  }
+}
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
index eed29367fa3..f676ba303b9 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
@@ -1,10 +1,10 @@
 <div class="card">
   <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', object.id]" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="object.logo">
+    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
     </ds-grid-thumbnail>
   </a>
   <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="object.logo">
+    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
     </ds-grid-thumbnail>
   </span>
   <div class="card-body">
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
index bb6c81144a8..dfcac7dc1f6 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
@@ -3,6 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { Community } from '../../../core/shared/community.model';
+import { LinkService } from '../../../core/cache/builders/link.service';
 
 let communityGridElementComponent: CommunityGridElementComponent;
 let fixture: ComponentFixture<CommunityGridElementComponent>;
@@ -29,12 +30,17 @@ const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
   }
 });
 
+const linkService = jasmine.createSpyObj('linkService', {
+  resolveLink: mockCommunityWithAbstract
+});
+
 describe('CommunityGridElementComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ CommunityGridElementComponent ],
       providers: [
-        { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract)}
+        { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract)},
+        { provide: LinkService, useValue: linkService}
       ],
 
     schemas: [ NO_ERRORS_SCHEMA ]
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
index 05c84b683b9..3bf6ffe104a 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -1,9 +1,11 @@
-import { Component } from '@angular/core';
-
+import { Component, Input } from '@angular/core';
 import { Community } from '../../../core/shared/community.model';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { followLink } from '../../utils/follow-link-config.model';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { hasNoValue, hasValue } from '../../empty.util';
 
 /**
  * Component representing a grid element for a community
@@ -15,4 +17,21 @@ import { listableObjectComponent } from '../../object-collection/shared/listable
 })
 
 @listableObjectComponent(Community, ViewMode.GridElement)
-export class CommunityGridElementComponent extends AbstractListableElementComponent<Community> {}
+export class CommunityGridElementComponent extends AbstractListableElementComponent<Community> {
+  private _object: Community;
+
+  constructor( private linkService: LinkService) {
+    super();
+  }
+
+  @Input() set object(object: Community) {
+    this._object = object;
+    if (hasValue(this._object) && hasNoValue(this._object.logo)) {
+      this.linkService.resolveLink<Community>(this._object, followLink('logo'))
+    }
+  }
+
+  get object(): Community {
+    return this._object;
+  }
+}
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
index 5b09d09a55d..1df4026f839 100644
--- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
+++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
@@ -1,3 +1,3 @@
 <div class="thumbnail">
-  <img [src]="src | dsSafeUrl" (error)="errorHandler($event)"/>
+  <img [src]="src | dsSafeUrl" (error)="errorHandler($event)" />
 </div>
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
index 4622483f2f8..92d93686dc2 100644
--- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
+++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
@@ -1,4 +1,10 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnInit,
+  SimpleChanges,
+} from '@angular/core';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { hasValue } from '../../empty.util';
 
@@ -11,10 +17,9 @@ import { hasValue } from '../../empty.util';
 @Component({
   selector: 'ds-grid-thumbnail',
   styleUrls: ['./grid-thumbnail.component.scss'],
-  templateUrl: './grid-thumbnail.component.html'
+  templateUrl: './grid-thumbnail.component.html',
 })
-export class GridThumbnailComponent implements OnInit {
-
+export class GridThumbnailComponent implements OnInit, OnChanges {
   @Input() thumbnail: Bitstream;
 
   data: any = {};
@@ -22,19 +27,46 @@ export class GridThumbnailComponent implements OnInit {
   /**
    * The default 'holder.js' image
    */
-  @Input() defaultImage? = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjYwIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDI2MCAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwL3RleHQ6Tm8gVGh1bWJuYWlsCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTVmNzJmMmFlMGIgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxM3B0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNWY3MmYyYWUwYiI+PHJlY3Qgd2lkdGg9IjI2MCIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI3Mi4yNDIxODc1IiB5PSI5NiI+Tm8gVGh1bWJuYWlsPC90ZXh0PjwvZz48L2c+PC9zdmc+';
+  @Input() defaultImage? =
+    'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjYwIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDI2MCAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwL3RleHQ6Tm8gVGh1bWJuYWlsCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTVmNzJmMmFlMGIgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxM3B0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNWY3MmYyYWUwYiI+PHJlY3Qgd2lkdGg9IjI2MCIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI3Mi4yNDIxODc1IiB5PSI5NiI+Tm8gVGh1bWJuYWlsPC90ZXh0PjwvZz48L2c+PC9zdmc+';
 
   src: string;
+
   errorHandler(event) {
     event.currentTarget.src = this.defaultImage;
   }
 
+  /**
+   * Initialize the src
+   */
   ngOnInit(): void {
-    if (hasValue(this.thumbnail) && hasValue(this.thumbnail._links) && this.thumbnail._links.content.href) {
-      this.src = this.thumbnail._links.content.href;
-    } else {
-      this.src = this.defaultImage
+    this.src = this.defaultImage;
+
+    this.checkThumbnail(this.thumbnail);
+  }
+
+  /**
+   * If the old input is undefined and the new one is a bitsream then set src
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (
+      !hasValue(changes.thumbnail.previousValue) &&
+      hasValue(changes.thumbnail.currentValue)
+    ) {
+      this.checkThumbnail(changes.thumbnail.currentValue);
     }
   }
 
+  /**
+   * check if the Bitstream has any content than set the src
+   */
+  checkThumbnail(thumbnail: Bitstream) {
+    if (
+      hasValue(thumbnail) &&
+      hasValue(thumbnail._links) &&
+      thumbnail._links.content.href
+    ) {
+      this.src = thumbnail._links.content.href;
+    }
+  }
 }
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.html b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.html
new file mode 100644
index 00000000000..434c4b5b5c2
--- /dev/null
+++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.html
@@ -0,0 +1,4 @@
+<ds-item-search-result-grid-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType">
+    <ng-content></ng-content>
+    <ng-content></ng-content>
+</ds-item-search-result-grid-element>
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.scss b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
similarity index 79%
rename from src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts
rename to src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
index 84f926bbe33..807c39801df 100644
--- a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
@@ -4,15 +4,15 @@ import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { PublicationGridElementComponent } from './publication-grid-element.component';
+import { ItemGridElementComponent } from './item-grid-element.component';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { Item } from '../../../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 
 const mockItem = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -41,7 +41,7 @@ const mockItem = Object.assign(new Item(), {
   }
 });
 
-describe('PublicationGridElementComponent', () => {
+describe('ItemGridElementComponent', () => {
   let comp;
   let fixture;
 
@@ -52,18 +52,18 @@ describe('PublicationGridElementComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [NoopAnimationsModule],
-      declarations: [PublicationGridElementComponent, TruncatePipe],
+      declarations: [ItemGridElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(PublicationGridElementComponent, {
+    }).overrideComponent(ItemGridElementComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
   }));
 
   beforeEach(async(() => {
-    fixture = TestBed.createComponent(PublicationGridElementComponent);
+    fixture = TestBed.createComponent(ItemGridElementComponent);
     comp = fixture.componentInstance;
   }));
 
@@ -74,7 +74,7 @@ describe('PublicationGridElementComponent', () => {
     });
 
     it(`should contain a PublicationGridElementComponent`, () => {
-      const publicationGridElement = fixture.debugElement.query(By.css(`ds-publication-search-result-grid-element`));
+      const publicationGridElement = fixture.debugElement.query(By.css(`ds-item-search-result-grid-element`));
       expect(publicationGridElement).not.toBeNull();
     });
   });
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
similarity index 74%
rename from src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.ts
rename to src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
index 8450150dcb8..c8a58c5a898 100644
--- a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
@@ -8,13 +8,13 @@ import { Item } from '../../../../../core/shared/item.model';
 @listableObjectComponent('Publication', ViewMode.GridElement)
 @listableObjectComponent(Item, ViewMode.GridElement)
 @Component({
-  selector: 'ds-publication-grid-element',
-  styleUrls: ['./publication-grid-element.component.scss'],
-  templateUrl: './publication-grid-element.component.html',
+  selector: 'ds-item-grid-element',
+  styleUrls: ['./item-grid-element.component.scss'],
+  templateUrl: './item-grid-element.component.html',
   animations: [focusShadow]
 })
 /**
  * The component for displaying a grid element for an item of the type Publication
  */
-export class PublicationGridElementComponent extends AbstractListableElementComponent<Item> {
+export class ItemGridElementComponent extends AbstractListableElementComponent<Item> {
 }
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.html b/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.html
deleted file mode 100644
index a9b5d0bdaa7..00000000000
--- a/src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<ds-publication-search-result-grid-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType">
-    <ng-content></ng-content>
-    <ng-content></ng-content>
-</ds-publication-search-result-grid-element>
diff --git a/src/app/shared/object-grid/object-grid.component.scss b/src/app/shared/object-grid/object-grid.component.scss
index fb883a1f074..53d64bc60c0 100644
--- a/src/app/shared/object-grid/object-grid.component.scss
+++ b/src/app/shared/object-grid/object-grid.component.scss
@@ -19,6 +19,7 @@ $ds-wrapper-grid-spacing: $spacer/2;
 .card-columns {
   margin-left: -$ds-wrapper-grid-spacing;
   margin-right: -$ds-wrapper-grid-spacing;
+  column-gap: 0;
 
   .card-column {
     padding-left: $ds-wrapper-grid-spacing;
diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
index c6f8347217c..cfcad1cff27 100644
--- a/src/app/shared/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -11,7 +11,7 @@ import {
 } from '@angular/core';
 
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { fadeIn } from '../animations/fade';
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
index a2933fd0ec5..f8c75fc0d4f 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
@@ -1,13 +1,14 @@
 <div class="card">
   <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', dso.id]" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="dso.logo">
+    <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
     </ds-grid-thumbnail>
   </a>
   <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="dso.logo">
+    <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
     </ds-grid-thumbnail>
   </span>
   <div class="card-body">
+    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
     <h4 class="card-title">{{dso.name}}</h4>
     <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
     <div *ngIf="linkType != linkTypes.None" class="text-center">
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
index d065f9c7e44..d40b99316a9 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
@@ -19,6 +19,7 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { CollectionSearchResultGridElementComponent } from './collection-search-result-grid-element.component';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 
 let collectionSearchResultGridElementComponent: CollectionSearchResultGridElementComponent;
 let fixture: ComponentFixture<CollectionSearchResultGridElementComponent>;
@@ -52,6 +53,9 @@ mockCollectionWithoutAbstract.indexableObject = Object.assign(new Collection(),
     ]
   }
 });
+const linkService = jasmine.createSpyObj('linkService', {
+  resolveLink: mockCollectionWithAbstract
+});
 
 describe('CollectionSearchResultGridElementComponent', () => {
   beforeEach(async(() => {
@@ -72,6 +76,7 @@ describe('CollectionSearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
+        { provide: LinkService, useValue: linkService}
       ],
 
       schemas: [ NO_ERRORS_SCHEMA ]
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
index a8343277361..72dfe97edf0 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -1,10 +1,14 @@
-import { Component } from '@angular/core';
-
+import { Component, Input } from '@angular/core';
 import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
 import { Collection } from '../../../../core/shared/collection.model';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { hasNoValue, hasValue } from '../../../empty.util';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 
 @Component({
   selector: 'ds-collection-search-result-grid-element',
@@ -15,4 +19,28 @@ import { listableObjectComponent } from '../../../object-collection/shared/lista
  * Component representing a grid element for a collection search result
  */
 @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement)
-export class CollectionSearchResultGridElementComponent extends SearchResultGridElementComponent<CollectionSearchResult, Collection> {}
+export class CollectionSearchResultGridElementComponent extends SearchResultGridElementComponent< CollectionSearchResult, Collection > {
+  private _dso: Collection;
+
+  constructor(
+    private linkService: LinkService,
+    protected truncatableService: TruncatableService,
+    protected bitstreamDataService: BitstreamDataService
+  ) {
+    super(truncatableService, bitstreamDataService);
+  }
+
+  @Input() set dso(dso: Collection) {
+    this._dso = dso;
+    if (hasValue(this._dso) && hasNoValue(this._dso.logo)) {
+      this.linkService.resolveLink<Collection>(
+        this._dso,
+        followLink('logo')
+      );
+    }
+  }
+
+  get dso(): Collection {
+    return this._dso;
+  }
+}
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
index 8d5f2884989..8025213b3bc 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
@@ -1,13 +1,14 @@
 <div class="card">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="card-img-top">
-        <ds-grid-thumbnail [thumbnail]="dso.logo">
+        <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
         </ds-grid-thumbnail>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="dso.logo">
+    <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
     </ds-grid-thumbnail>
   </span>
     <div class="card-body">
+        <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
         <h4 class="card-title">{{dso.name}}</h4>
         <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
         <div *ngIf="linkType != linkTypes.None" class="text-center">
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
index 0d59273111a..7b3fe0a7dc9 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
@@ -19,6 +19,7 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { CommunitySearchResultGridElementComponent } from './community-search-result-grid-element.component';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 
 let communitySearchResultGridElementComponent: CommunitySearchResultGridElementComponent;
 let fixture: ComponentFixture<CommunitySearchResultGridElementComponent>;
@@ -52,6 +53,9 @@ mockCommunityWithoutAbstract.indexableObject = Object.assign(new Community(), {
     ]
   }
 });
+const linkService = jasmine.createSpyObj('linkService', {
+  resolveLink: mockCommunityWithAbstract
+});
 
 describe('CommunitySearchResultGridElementComponent', () => {
   beforeEach(async(() => {
@@ -72,6 +76,7 @@ describe('CommunitySearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
+        { provide: LinkService, useValue: linkService}
       ],
 
       schemas: [ NO_ERRORS_SCHEMA ]
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
index e726c3e8030..5c4deb10647 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -1,18 +1,46 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { Community } from '../../../../core/shared/community.model';
 import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { hasNoValue, hasValue } from '../../../empty.util';
+import { followLink } from '../../../utils/follow-link-config.model';
 
 @Component({
   selector: 'ds-community-search-result-grid-element',
-  styleUrls: ['../search-result-grid-element.component.scss', 'community-search-result-grid-element.component.scss'],
-  templateUrl: 'community-search-result-grid-element.component.html'
+  styleUrls: [
+    '../search-result-grid-element.component.scss',
+    'community-search-result-grid-element.component.scss',
+  ],
+  templateUrl: 'community-search-result-grid-element.component.html',
 })
 /**
  * Component representing a grid element for a community search result
  */
 @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement)
-export class CommunitySearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult, Community> {
+export class CommunitySearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult,Community> {
+  private _dso: Community;
+
+  constructor(
+    private linkService: LinkService,
+    protected truncatableService: TruncatableService,
+    protected bitstreamDataService: BitstreamDataService
+  ) {
+    super(truncatableService, bitstreamDataService);
+  }
+
+  @Input() set dso(dso: Community) {
+    this._dso = dso;
+    if (hasValue(this._dso) && hasNoValue(this._dso.logo)) {
+      this.linkService.resolveLink<Community>(this._dso, followLink('logo'));
+    }
+  }
+
+  get dso(): Community {
+    return this._dso;
+  }
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
similarity index 90%
rename from src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
rename to src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index ec0b792e343..6258d61d44f 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -1,6 +1,8 @@
   <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
     <ds-truncatable [id]="dso.id">
-      <ng-content></ng-content>
+      <div class="position-absolute ml-1">
+        <ng-content></ng-content>
+      </div>
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]"
          class="card-img-top full-width">
           <div>
@@ -10,12 +12,12 @@
       </a>
       <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
           <div>
-              <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
+              <ds-grid-thumbnail [thumbnail]="getThumbnail()  | async">
               </ds-grid-thumbnail>
           </div>
       </span>
       <div class="card-body">
-          <ds-item-type-badge [object]="dso"></ds-item-type-badge>
+          <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
           <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
               <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
           </ds-truncatable-part>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
similarity index 91%
rename from src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec.ts
rename to src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
index 0688b7c60e2..50ff6e06412 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
@@ -12,7 +12,7 @@ import { BitstreamDataService } from '../../../../../core/data/bitstream-data.se
 import { CommunityDataService } from '../../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
@@ -24,12 +24,12 @@ import { ItemSearchResult } from '../../../../object-collection/shared/item-sear
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { PublicationSearchResultGridElementComponent } from './publication-search-result-grid-element.component';
+import { ItemSearchResultGridElementComponent } from './item-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -61,7 +61,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithoutMetadata.hitHighlights = {};
 mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
@@ -72,7 +72,7 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
   }
 });
 
-describe('PublicationGridElementComponent', getEntityGridElementTestComponent(PublicationSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['authors', 'date', 'abstract']));
+describe('ItemGridElementComponent', getEntityGridElementTestComponent(ItemSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['authors', 'date', 'abstract']));
 
 /**
  * Create test cases for a grid component of an entity.
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
similarity index 71%
rename from src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.ts
rename to src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index c96e73d3651..e7297564523 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -9,13 +9,13 @@ import { ItemSearchResult } from '../../../../object-collection/shared/item-sear
 @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement)
 @Component({
-  selector: 'ds-publication-search-result-grid-element',
-  styleUrls: ['./publication-search-result-grid-element.component.scss'],
-  templateUrl: './publication-search-result-grid-element.component.html',
+  selector: 'ds-item-search-result-grid-element',
+  styleUrls: ['./item-search-result-grid-element.component.scss'],
+  templateUrl: './item-search-result-grid-element.component.html',
   animations: [focusShadow]
 })
 /**
  * The component for displaying a grid element for an item search result of the type Publication
  */
-export class PublicationSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> {
+export class ItemSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> {
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index dc05f78e408..a53beaf922b 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -6,10 +6,10 @@ import { BitstreamDataService } from '../../../core/data/bitstream-data.service'
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { TruncatableService } from '../../truncatable/truncatable.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-search-result-grid-element',
@@ -32,9 +32,6 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
     protected bitstreamDataService: BitstreamDataService
   ) {
     super();
-    if (hasValue(this.object)) {
-      this.isCollapsed$ = this.isCollapsed();
-    }
   }
 
   /**
@@ -43,6 +40,7 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
   ngOnInit(): void {
     if (hasValue(this.object)) {
       this.dso = this.object.indexableObject;
+      this.isCollapsed$ = this.isCollapsed();
     }
   }
 
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
new file mode 100644
index 00000000000..3877e2f335b
--- /dev/null
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
@@ -0,0 +1 @@
+<ds-item-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-item-search-result-list-element>
diff --git a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.scss b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.scss
similarity index 100%
rename from src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.scss
rename to src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.scss
diff --git a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
similarity index 83%
rename from src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.spec.ts
rename to src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
index 85b964c0833..6897b81f0af 100644
--- a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { PublicationListElementComponent } from './publication-list-element.component';
+import { ItemListElementComponent } from './item-list-element.component';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
@@ -43,7 +43,7 @@ const mockItem: Item = Object.assign(new Item(), {
   }
 });
 
-describe('PublicationListElementComponent', () => {
+describe('ItemListElementComponent', () => {
   let comp;
   let fixture;
 
@@ -53,18 +53,18 @@ describe('PublicationListElementComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [PublicationListElementComponent, TruncatePipe],
+      declarations: [ItemListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(PublicationListElementComponent, {
+    }).overrideComponent(ItemListElementComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
   }));
 
   beforeEach(async(() => {
-    fixture = TestBed.createComponent(PublicationListElementComponent);
+    fixture = TestBed.createComponent(ItemListElementComponent);
     comp = fixture.componentInstance;
   }));
 
@@ -75,7 +75,7 @@ describe('PublicationListElementComponent', () => {
     });
 
     it(`should contain a PublicationListElementComponent`, () => {
-      const publicationListElement = fixture.debugElement.query(By.css(`ds-publication-search-result-list-element`));
+      const publicationListElement = fixture.debugElement.query(By.css(`ds-item-search-result-list-element`));
       expect(publicationListElement).not.toBeNull();
     });
   });
diff --git a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
similarity index 72%
rename from src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.ts
rename to src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
index 59d0249aef7..a3bd2a1ce00 100644
--- a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
@@ -7,12 +7,12 @@ import { Item } from '../../../../../core/shared/item.model';
 @listableObjectComponent('Publication', ViewMode.ListElement)
 @listableObjectComponent(Item, ViewMode.ListElement)
 @Component({
-  selector: 'ds-publication-list-element',
-  styleUrls: ['./publication-list-element.component.scss'],
-  templateUrl: './publication-list-element.component.html'
+  selector: 'ds-item-list-element',
+  styleUrls: ['./item-list-element.component.scss'],
+  templateUrl: './item-list-element.component.html'
 })
 /**
  * The component for displaying a list element for an item of the type Publication
  */
-export class PublicationListElementComponent extends AbstractListableElementComponent<Item> {
+export class ItemListElementComponent extends AbstractListableElementComponent<Item> {
 }
diff --git a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html
deleted file mode 100644
index acc3ee4194a..00000000000
--- a/src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ds-publication-search-result-list-element [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-publication-search-result-list-element>
\ No newline at end of file
diff --git a/src/app/shared/object-list/item-type-badge/item-type-badge.component.html b/src/app/shared/object-list/item-type-badge/item-type-badge.component.html
deleted file mode 100644
index 947970b7e10..00000000000
--- a/src/app/shared/object-list/item-type-badge/item-type-badge.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div *ngIf="object && object.firstMetadataValue('relationship.type') as type">
-  <span class="badge badge-light">{{ type.toLowerCase() + '.listelement.badge' | translate }}</span>
-</div>
diff --git a/src/app/shared/object-list/item-type-badge/item-type-badge.component.ts b/src/app/shared/object-list/item-type-badge/item-type-badge.component.ts
deleted file mode 100644
index 88fe2d7f54e..00000000000
--- a/src/app/shared/object-list/item-type-badge/item-type-badge.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-
-@Component({
-  selector: 'ds-item-type-badge',
-  templateUrl: './item-type-badge.component.html'
-})
-/**
- * Component rendering the type of an item as a badge
- */
-export class ItemTypeBadgeComponent {
-  /**
-   * The component used to retrieve the type from
-   */
-  @Input() object: DSpaceObject;
-}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index e1478b52063..bf7f04b9ac6 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -2,7 +2,7 @@
   <ng-container *ngIf="status">
     <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
   </ng-container>
-  <ds-item-type-badge [object]="item"></ds-item-type-badge>
+  <ds-type-badge [object]="item"></ds-type-badge>
   <ds-truncatable [id]="item.id">
     <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-title' | translate)" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
     <div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
index 56cf840f4ac..af6c44786b6 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -153,7 +153,7 @@ describe('ItemListPreviewComponent', () => {
     });
 
     it('should show the entity type span', () => {
-      const entityField = fixture.debugElement.query(By.css('ds-item-type-badge'));
+      const entityField = fixture.debugElement.query(By.css('ds-type-badge'));
       expect(entityField).not.toBeNull();
     });
   });
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index 5f6b1d1ec87..4aecaaac8fc 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -12,20 +12,16 @@
         (sortFieldChange)="onSortFieldChange($event)"
         (paginationChange)="onPaginationChange($event)">
     <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}">
-        <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4" [class.border-bottom]="hasBorder && !last">
-          <span *ngIf="selectable">
-                   <ds-selectable-list-item-control [index]="i"
-                                                    [object]="object"
-                                                    [selectionConfig]="selectionConfig"
-                                                    (deselectObject)="deselectObject.emit($event)"
-                                                    (selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
-              </span>
-          <span *ngIf="importable">
-            <ds-importable-list-item-control  [object]="object"
-                                              [importConfig]="importConfig"
-                                              (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
-          </span>
-            <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [index]="i" [context]="context" [linkType]="linkType"
+        <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last">
+          <ds-selectable-list-item-control *ngIf="selectable" [index]="i"
+                                           [object]="object"
+                                           [selectionConfig]="selectionConfig"
+                                           (deselectObject)="deselectObject.emit($event)"
+                                           (selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
+          <ds-importable-list-item-control *ngIf="importable" [object]="object"
+                                           [importConfig]="importConfig"
+                                           (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
+          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [index]="i" [context]="context" [linkType]="linkType"
                                                  [listID]="selectionConfig?.listId"></ds-listable-object-component-loader>
         </li>
     </ul>
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 60544c4ec52..b58c8b358e3 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { fadeIn } from '../animations/fade';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index 3c787c47ce8..1c081e28059 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,3 +1,4 @@
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
 <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="firstMetadataValue('dc.title')"></a>
 <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="firstMetadataValue('dc.title')"></span>
 <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index 32834fefeeb..08b02d123a1 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,3 +1,4 @@
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
 <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="firstMetadataValue('dc.title')"></a>
 <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="firstMetadataValue('dc.title')"></span>
 <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
new file mode 100644
index 00000000000..880f4393cd0
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -0,0 +1,28 @@
+<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+
+<ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+       [routerLink]="['/items/' + dso.id]" class="lead"
+       [innerHTML]="firstMetadataValue('dc.title')"></a>
+    <span *ngIf="linkType == linkTypes.None" class="lead"
+          [innerHTML]="firstMetadataValue('dc.title')"></span>
+    <span class="text-muted">
+      <ds-truncatable-part [id]="dso.id" [minLines]="1">
+        <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
+          (<span *ngIf="dso.firstMetadataValue('dc.publisher')" class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher') + ', '"></span>
+          <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
+        </ng-container>
+        <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
+          <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+              <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+              <span *ngIf="!last">; </span>
+          </span>
+        </span>
+      </ds-truncatable-part>
+    </span>
+    <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
+        <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
+                [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
+        </ds-truncatable-part>
+    </div>
+</ds-truncatable>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.scss b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss
similarity index 100%
rename from src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.scss
rename to src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
similarity index 90%
rename from src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.spec.ts
rename to src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index 9b61a133bee..d76bf96ff50 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -2,14 +2,14 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { PublicationSearchResultListElementComponent } from './publication-search-result-list-element.component';
+import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component';
 import { Item } from '../../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../../truncatable/truncatable.service';
 import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
 
-let publicationListElementComponent: PublicationSearchResultListElementComponent;
-let fixture: ComponentFixture<PublicationSearchResultListElementComponent>;
+let publicationListElementComponent: ItemSearchResultListElementComponent;
+let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
 
 const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   indexableObject:
@@ -64,22 +64,22 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(new ItemSearchRe
     })
 });
 
-describe('PublicationListElementComponent', () => {
+describe('ItemListElementComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [PublicationSearchResultListElementComponent, TruncatePipe],
+      declarations: [ItemSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} }
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(PublicationSearchResultListElementComponent, {
+    }).overrideComponent(ItemSearchResultListElementComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
   }));
 
   beforeEach(async(() => {
-    fixture = TestBed.createComponent(PublicationSearchResultListElementComponent);
+    fixture = TestBed.createComponent(ItemSearchResultListElementComponent);
     publicationListElementComponent = fixture.componentInstance;
 
   }));
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
similarity index 70%
rename from src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.ts
rename to src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 3e0db60b4c1..b4b658cb963 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -8,12 +8,12 @@ import { Item } from '../../../../../../core/shared/item.model';
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
 @Component({
-  selector: 'ds-publication-search-result-list-element',
-  styleUrls: ['./publication-search-result-list-element.component.scss'],
-  templateUrl: './publication-search-result-list-element.component.html'
+  selector: 'ds-item-search-result-list-element',
+  styleUrls: ['./item-search-result-list-element.component.scss'],
+  templateUrl: './item-search-result-list-element.component.html'
 })
 /**
  * The component for displaying a list element for an item search result of the type Publication
  */
-export class PublicationSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
+export class ItemSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.html
deleted file mode 100644
index 3d2604585d7..00000000000
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<ds-item-type-badge [object]="dso"></ds-item-type-badge>
-
-<ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
-       [routerLink]="['/items/' + dso.id]" class="lead"
-       [innerHTML]="firstMetadataValue('dc.title')"></a>
-    <span *ngIf="linkType == linkTypes.None" class="lead"
-          [innerHTML]="firstMetadataValue('dc.title')"></span>
-    <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">(<span class="item-list-publisher"
-                                                                                                                            [innerHTML]="firstMetadataValue('dc.publisher')">, </span><span
-                    *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date"
-                    [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)</ng-container>
-            <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0"
-                  class="item-list-authors">
-                    <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-                        <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-                        <span *ngIf="!last">; </span>
-                    </span>
-            </span>
-        </ds-truncatable-part>
-  </span>
-    <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-                [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
-        </ds-truncatable-part>
-    </div>
-</ds-truncatable>
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..be3ee7d1bb9
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,37 @@
+import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec';
+
+const object = Object.assign(new CollectionSearchResult(), {
+  indexableObject: Object.assign(new Collection(), {
+    id: 'test-collection',
+    metadata: {
+      'dc.title': [
+        {
+          value: 'title'
+        }
+      ],
+      'dc.description.abstract': [
+        {
+          value: 'description'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Community(), {
+  id: 'test-community',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('CollectionSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+);
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..13703240f43
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
+
+@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-collection-sidebar-search-list-element',
+  templateUrl: '../sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link CollectionSearchResult} within the context of a sidebar search modal
+ */
+export class CollectionSidebarSearchListElementComponent extends SidebarSearchListElementComponent<CollectionSearchResult, Collection> {
+  /**
+   * Get the description of the Collection by returning its abstract
+   */
+  getDescription(): string {
+    return this.firstMetadataValue('dc.description.abstract');
+  }
+}
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..d6bcfc85810
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,36 @@
+import { Community } from '../../../../core/shared/community.model';
+import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec';
+import { CommunitySidebarSearchListElementComponent } from './community-sidebar-search-list-element.component';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+
+const object = Object.assign(new CommunitySearchResult(), {
+  indexableObject: Object.assign(new Community(), {
+    id: 'test-community',
+    metadata: {
+      'dc.title': [
+        {
+          value: 'title'
+        }
+      ],
+      'dc.description.abstract': [
+        {
+          value: 'description'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Community(), {
+  id: 'test-parent-community',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('CommunitySidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+);
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..14c8ec09cd7
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { Community } from '../../../../core/shared/community.model';
+
+@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-collection-sidebar-search-list-element',
+  templateUrl: '../sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link CommunitySearchResult} within the context of a sidebar search modal
+ */
+export class CommunitySidebarSearchListElementComponent extends SidebarSearchListElementComponent<CommunitySearchResult, Community> {
+  /**
+   * Get the description of the Community by returning its abstract
+   */
+  getDescription(): string {
+    return this.firstMetadataValue('dc.description.abstract');
+  }
+}
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..106289bba6d
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,47 @@
+import { createSidebarSearchListElementTests } from '../../sidebar-search-list-element.component.spec';
+import { PublicationSidebarSearchListElementComponent } from './publication-sidebar-search-list-element.component';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { Collection } from '../../../../../core/shared/collection.model';
+
+const object = Object.assign(new ItemSearchResult(), {
+  indexableObject: Object.assign(new Item(), {
+    id: 'test-item',
+    metadata: {
+      'dc.title': [
+        {
+          value: 'title'
+        }
+      ],
+      'dc.publisher': [
+        {
+          value: 'publisher'
+        }
+      ],
+      'dc.date.issued': [
+        {
+          value: 'date'
+        }
+      ],
+      'dc.contributor.author': [
+        {
+          value: 'author'
+        }
+      ]
+    }
+  })
+});
+const parent = Object.assign(new Collection(), {
+  id: 'test-collection',
+  metadata: {
+    'dc.title': [
+      {
+        value: 'parent title'
+      }
+    ]
+  }
+});
+
+describe('PublicationSidebarSearchListElementComponent',
+  createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '(publisher, date) author')
+);
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..0822accc501
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -0,0 +1,23 @@
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { Component } from '@angular/core';
+import { Context } from '../../../../../core/shared/context.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { SidebarSearchListElementComponent } from '../../sidebar-search-list-element.component';
+
+@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@Component({
+  selector: 'ds-publication-sidebar-search-list-element',
+  templateUrl: '../../sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link ItemSearchResult} of type "Publication" within the context of
+ * a sidebar search modal
+ */
+export class PublicationSidebarSearchListElementComponent extends SidebarSearchListElementComponent<ItemSearchResult, Item> {
+
+}
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
new file mode 100644
index 00000000000..3f93caa2782
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
@@ -0,0 +1,14 @@
+<ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'">
+  <div [ngClass]="isCurrent() ? 'text-light' : 'text-body'"
+       [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
+</ds-truncatable-part>
+<ds-truncatable-part *ngIf="title" [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'">
+  <div class="font-weight-bold"
+       [ngClass]="isCurrent() ? 'text-light' : 'text-primary'"
+       [innerHTML]="title"></div>
+</ds-truncatable-part>
+<ds-truncatable-part *ngIf="description" [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'">
+  <div class="text-secondary"
+       [ngClass]="isCurrent() ? 'text-light' : 'text-secondary'"
+       [innerHTML]="description"></div>
+</ds-truncatable-part>
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
new file mode 100644
index 00000000000..f7ec05df950
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
@@ -0,0 +1,69 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VarDirective } from '../../utils/var.directive';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { SearchResult } from '../../search/search-result.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { TruncatableService } from '../../truncatable/truncatable.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { HALResource } from '../../../core/shared/hal-resource.model';
+import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+
+export function createSidebarSearchListElementTests(
+  componentClass: any,
+  object: SearchResult<DSpaceObject & ChildHALResource>,
+  parent: DSpaceObject,
+  expectedParentTitle: string,
+  expectedTitle: string,
+  expectedDescription: string,
+  extraProviders: any[] = []
+) {
+  return () => {
+    let component;
+    let fixture: ComponentFixture<any>;
+
+    let linkService;
+
+    beforeEach(async(() => {
+      linkService = jasmine.createSpyObj('linkService', {
+        resolveLink: Object.assign(new HALResource(), {
+          [object.indexableObject.getParentLinkKey()]: createSuccessfulRemoteDataObject$(parent)
+        })
+      });
+      TestBed.configureTestingModule({
+        declarations: [componentClass, VarDirective],
+        imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+        providers: [
+          { provide: TruncatableService, useValue: {} },
+          { provide: LinkService, useValue: linkService },
+          ...extraProviders
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      }).compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(componentClass);
+      component = fixture.componentInstance;
+      component.object = object;
+      fixture.detectChanges();
+    });
+
+    it('should contain the correct parent title', (done) => {
+      component.parentTitle$.subscribe((title) => {
+        expect(title).toEqual(expectedParentTitle);
+        done();
+      });
+    });
+
+    it('should contain the correct title', () => {
+      expect(component.title).toEqual(expectedTitle);
+    });
+
+    it('should contain the correct description', () => {
+      expect(component.description).toEqual(expectedDescription);
+    });
+  };
+}
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
new file mode 100644
index 00000000000..478bf507716
--- /dev/null
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -0,0 +1,153 @@
+import { SearchResult } from '../../search/search-result.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component';
+import { Component } from '@angular/core';
+import { hasValue, isNotEmpty } from '../../empty.util';
+import { Observable } from 'rxjs/internal/Observable';
+import { TruncatableService } from '../../truncatable/truncatable.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { find, map } from 'rxjs/operators';
+import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+import { followLink } from '../../utils/follow-link-config.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { of as observableOf } from 'rxjs';
+import { Context } from '../../../core/shared/context.model';
+
+@Component({
+  selector: 'ds-sidebar-search-list-element',
+  templateUrl: './sidebar-search-list-element.component.html'
+})
+/**
+ * Component displaying a list element for a {@link SearchResult} in the sidebar search modal
+ * It displays the name of the parent, title and description of the object. All of which are customizable in the child
+ * component by overriding the relevant methods of this component
+ */
+export class SidebarSearchListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends SearchResultListElementComponent<T, K> {
+  /**
+   * Observable for the title of the parent object (displayed above the object's title)
+   */
+  parentTitle$: Observable<string>;
+
+  /**
+   * The title for the object to display
+   */
+  title: string;
+
+  /**
+   * A description to display below the title
+   */
+  description: string;
+
+  public constructor(protected truncatableService: TruncatableService,
+                     protected linkService: LinkService) {
+    super(truncatableService);
+  }
+
+  /**
+   * Initialise the component variables
+   */
+  ngOnInit(): void {
+    super.ngOnInit();
+    if (hasValue(this.dso)) {
+      this.parentTitle$ = this.getParentTitle();
+      this.title = this.getTitle();
+      this.description = this.getDescription();
+    }
+  }
+
+  /**
+   * returns true if this element represents the current dso
+   */
+  isCurrent(): boolean {
+    return this.context === Context.SideBarSearchModalCurrent;
+  }
+
+  /**
+   * Get the title of the object's parent
+   * Retrieve the parent by using the object's parent link and retrieving its 'dc.title' metadata
+   */
+  getParentTitle(): Observable<string> {
+    return this.getParent().pipe(
+      map((parentRD: RemoteData<DSpaceObject>) => {
+        return hasValue(parentRD) && hasValue(parentRD.payload) ? parentRD.payload.firstMetadataValue('dc.title') : undefined;
+      })
+    );
+  }
+
+  /**
+   * Get the parent of the object
+   */
+  getParent(): Observable<RemoteData<DSpaceObject>> {
+    if (typeof (this.dso as any).getParentLinkKey === 'function') {
+      const propertyName = (this.dso as any).getParentLinkKey();
+      return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe(
+        find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204)
+      );
+    }
+    return observableOf(undefined);
+  }
+
+  /**
+   * Get the title of the object
+   * Default: "dc.title"
+   */
+  getTitle(): string {
+    return this.firstMetadataValue('dc.title');
+  }
+
+  /**
+   * Get the description of the object
+   * Default: "(dc.publisher, dc.date.issued) authors"
+   */
+  getDescription(): string {
+    const publisher = this.firstMetadataValue('dc.publisher');
+    const date = this.firstMetadataValue('dc.date.issued');
+    const authors = this.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);
+    let description = '';
+    if (isNotEmpty(publisher) || isNotEmpty(date)) {
+      description += '(';
+    }
+    if (isNotEmpty(publisher)) {
+      description += publisher;
+    }
+    if (isNotEmpty(date)) {
+      if (isNotEmpty(publisher)) {
+        description += ', ';
+      }
+      description += date;
+    }
+    if (isNotEmpty(description)) {
+      description += ') ';
+    }
+    if (isNotEmpty(authors)) {
+      authors.forEach((author, i) => {
+        description += author;
+        if (i < (authors.length - 1)) {
+          description += '; ';
+        }
+      });
+    }
+    return this.undefinedIfEmpty(description);
+  }
+
+  /**
+   * Return undefined if the provided string is empty
+   * @param value Value to check
+   */
+  undefinedIfEmpty(value: string) {
+    return this.defaultIfEmpty(value, undefined);
+  }
+
+  /**
+   * Return a default value if the provided string is empty
+   * @param value Value to check
+   * @param def   Default in case value is empty
+   */
+  defaultIfEmpty(value: string, def: string) {
+    if (isNotEmpty(value)) {
+      return value;
+    } else {
+      return def;
+    }
+  }
+}
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.html b/src/app/shared/object-list/type-badge/type-badge.component.html
new file mode 100644
index 00000000000..18aeeb4bca9
--- /dev/null
+++ b/src/app/shared/object-list/type-badge/type-badge.component.html
@@ -0,0 +1,3 @@
+<div *ngIf="typeMessage">
+  <span class="badge badge-light">{{ typeMessage | translate }}</span>
+</div>
diff --git a/src/app/shared/object-list/item-type-badge/item-type-badge.component.spec.ts b/src/app/shared/object-list/type-badge/type-badge.component.spec.ts
similarity index 83%
rename from src/app/shared/object-list/item-type-badge/item-type-badge.component.spec.ts
rename to src/app/shared/object-list/type-badge/type-badge.component.spec.ts
index f75a49363ff..e3a1d64f9f9 100644
--- a/src/app/shared/object-list/item-type-badge/item-type-badge.component.spec.ts
+++ b/src/app/shared/object-list/type-badge/type-badge.component.spec.ts
@@ -5,11 +5,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { TruncatePipe } from '../../utils/truncate.pipe';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ItemTypeBadgeComponent } from './item-type-badge.component';
 import { By } from '@angular/platform-browser';
+import { TypeBadgeComponent } from './type-badge.component';
 
-let comp: ItemTypeBadgeComponent;
-let fixture: ComponentFixture<ItemTypeBadgeComponent>;
+let comp: TypeBadgeComponent;
+let fixture: ComponentFixture<TypeBadgeComponent>;
 
 const type = 'authorOfPublication';
 
@@ -41,15 +41,15 @@ describe('ItemTypeBadgeComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ItemTypeBadgeComponent, TruncatePipe],
+      declarations: [TypeBadgeComponent, TruncatePipe],
       schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(ItemTypeBadgeComponent, {
+    }).overrideComponent(TypeBadgeComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
   }));
 
   beforeEach(async(() => {
-    fixture = TestBed.createComponent(ItemTypeBadgeComponent);
+    fixture = TestBed.createComponent(TypeBadgeComponent);
     comp = fixture.componentInstance;
   }));
 
@@ -71,9 +71,9 @@ describe('ItemTypeBadgeComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should not show a badge', () => {
+    it('should show an item badge', () => {
       const badge = fixture.debugElement.query(By.css('span.badge'));
-      expect(badge).toBeNull();
+      expect(badge.nativeElement.textContent).toContain('item');
     });
   });
 });
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.ts b/src/app/shared/object-list/type-badge/type-badge.component.ts
new file mode 100644
index 00000000000..8e843af1e7b
--- /dev/null
+++ b/src/app/shared/object-list/type-badge/type-badge.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { hasValue, isEmpty } from '../../empty.util';
+import { getResourceTypeValueFor } from '../../../core/cache/object-cache.reducer';
+
+@Component({
+  selector: 'ds-type-badge',
+  templateUrl: './type-badge.component.html'
+})
+/**
+ * Component rendering the type of an item as a badge
+ */
+export class TypeBadgeComponent {
+
+  private _object: DSpaceObject;
+  private _typeMessage: string;
+
+  /**
+   * The component used to retrieve the type from
+   */
+  @Input() set object(object: DSpaceObject) {
+    this._object = object;
+
+    const renderTypes = this._object.getRenderTypes();
+    if (!isEmpty(renderTypes.length)) {
+      const renderType = renderTypes[0];
+      if (renderType instanceof Function) {
+        const resourceTypeValue = getResourceTypeValueFor(object.type);
+        if (hasValue(resourceTypeValue)) {
+          this._typeMessage = `${resourceTypeValue.toLowerCase()}.listelement.badge`;
+        } else {
+          this._typeMessage = `${renderType.name.toLowerCase()}.listelement.badge`;
+        }
+      } else {
+        this._typeMessage = `${renderType.toLowerCase()}.listelement.badge`;
+      }
+    }
+  }
+
+  get object(): DSpaceObject {
+    return this._object;
+  }
+
+  get typeMessage(): string {
+    return this._typeMessage;
+  }
+}
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
index 84414ed023c..8ef5f985ed4 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
@@ -1,8 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
@@ -14,7 +11,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { CollectionSelectComponent } from './collection-select.component';
 import { Collection } from '../../../core/shared/collection.model';
-import { of } from 'rxjs/internal/observable/of';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { createPaginatedList } from '../../testing/utils.test';
 
 describe('CollectionSelectComponent', () => {
   let comp: CollectionSelectComponent;
@@ -31,7 +29,7 @@ describe('CollectionSelectComponent', () => {
       name: 'name2'
     })
   ];
-  const mockCollections = of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), mockCollectionList)));
+  const mockCollections = createSuccessfulRemoteDataObject$(createPaginatedList(mockCollectionList));
   const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'search-page-configuration',
     pageSize: 10,
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 594426869b2..9712aafeaa9 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -1,10 +1,7 @@
 import { ItemSelectComponent } from './item-select.component';
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Item } from '../../../core/shared/item.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
@@ -15,6 +12,8 @@ import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { of } from 'rxjs/internal/observable/of';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { createPaginatedList } from '../../testing/utils.test';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -53,7 +52,7 @@ describe('ItemSelectComponent', () => {
         }]
     })
   ];
-  const mockItems = of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), mockItemList)));
+  const mockItems = createSuccessfulRemoteDataObject$(createPaginatedList(mockItemList));
   const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'search-page-configuration',
     pageSize: 10,
diff --git a/src/app/shared/object-select/object-select/object-select.component.ts b/src/app/shared/object-select/object-select/object-select.component.ts
index e3a50b80247..3f672f92c93 100644
--- a/src/app/shared/object-select/object-select/object-select.component.ts
+++ b/src/app/shared/object-select/object-select/object-select.component.ts
@@ -2,7 +2,7 @@ import { EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { take } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { ObjectSelectService } from '../object-select.service';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
index 9fcfd21586a..8ba9c75fcbb 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
@@ -3,7 +3,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
 import { ElementRef } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { FieldUpdates } from '../../core/data/object-updates/object-updates.reducer';
@@ -12,14 +12,16 @@ import { take } from 'rxjs/operators';
 import { PaginationComponent } from '../pagination/pagination.component';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
+import { ObjectValuesPipe } from '../utils/object-values-pipe';
 
 class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
 
   constructor(protected objectUpdatesService: ObjectUpdatesService,
               protected elRef: ElementRef,
+              protected objectValuesPipe: ObjectValuesPipe,
               protected mockUrl: string,
               protected mockObjectsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>) {
-    super(objectUpdatesService, elRef);
+    super(objectUpdatesService, elRef, objectValuesPipe);
   }
 
   initializeObjectsRD(): void {
@@ -35,6 +37,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
   let component: MockAbstractPaginatedDragAndDropListComponent;
   let objectUpdatesService: ObjectUpdatesService;
   let elRef: ElementRef;
+  let objectValuesPipe: ObjectValuesPipe;
 
   const url = 'mock-abstract-paginated-drag-and-drop-list-component';
 
@@ -52,32 +55,26 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
 
   beforeEach(() => {
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
-      initializeWithCustomOrder: {},
-      addPageToCustomOrder: {},
-      getFieldUpdatesByCustomOrder: observableOf(updates),
-      saveMoveFieldUpdate: {}
+      initialize: {},
+      getFieldUpdatesExclusive: observableOf(updates)
     });
     elRef = {
       nativeElement: jasmine.createSpyObj('nativeElement', {
         querySelector: {}
       })
     };
+    objectValuesPipe = new ObjectValuesPipe();
     paginationComponent = jasmine.createSpyObj('paginationComponent', {
       doPageChange: {}
     });
     objectsRD$ = new BehaviorSubject(objectsRD);
-    component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, url, objectsRD$);
+    component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, objectValuesPipe, url, objectsRD$);
     component.paginationComponent = paginationComponent;
     component.ngOnInit();
   });
 
-  it('should call initializeWithCustomOrder to initialize the first page and add it to initializedPages', (done) => {
-    expect(component.initializedPages.indexOf(0)).toBeLessThan(0);
-    component.updates$.pipe(take(1)).subscribe(() => {
-      expect(objectUpdatesService.initializeWithCustomOrder).toHaveBeenCalled();
-      expect(component.initializedPages.indexOf(0)).toBeGreaterThanOrEqual(0);
-      done();
-    });
+  it('should call initialize to initialize the objects in the store', () => {
+    expect(objectUpdatesService.initialize).toHaveBeenCalled();
   });
 
   it('should initialize the updates correctly', (done) => {
@@ -87,43 +84,6 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
     });
   });
 
-  describe('when a new page is loaded', () => {
-    const page = 5;
-
-    beforeEach((done) => {
-      component.updates$.pipe(take(1)).subscribe(() => {
-        component.currentPage$.next(page);
-        objectsRD$.next(objectsRD);
-        done();
-      });
-    });
-
-    it('should call addPageToCustomOrder to initialize the new page and add it to initializedPages', (done) => {
-      component.updates$.pipe(take(1)).subscribe(() => {
-        expect(objectUpdatesService.addPageToCustomOrder).toHaveBeenCalled();
-        expect(component.initializedPages.indexOf(page - 1)).toBeGreaterThanOrEqual(0);
-        done();
-      });
-    });
-
-    describe('twice', () => {
-      beforeEach((done) => {
-        component.updates$.pipe(take(1)).subscribe(() => {
-          component.currentPage$.next(page);
-          objectsRD$.next(objectsRD);
-          done();
-        });
-      });
-
-      it('shouldn\'t call addPageToCustomOrder again, as the page has already been initialized', (done) => {
-        component.updates$.pipe(take(1)).subscribe(() => {
-          expect(objectUpdatesService.addPageToCustomOrder).toHaveBeenCalledTimes(1);
-          done();
-        });
-      });
-    });
-  });
-
   describe('switchPage', () => {
     const page = 3;
 
@@ -149,30 +109,31 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
 
       beforeEach(() => {
         elRef.nativeElement.querySelector.and.returnValue(hoverElement);
-        component.initializedPages.push(hoverPage - 1);
+        spyOn(component.dropObject, 'emit');
         component.drop(event);
       });
 
-      it('should detect the page and set currentPage$ to its value', () => {
-        expect(component.currentPage$.value).toEqual(hoverPage);
-      });
-
-      it('should detect the page and update the pagination component with its value', () => {
-        expect(paginationComponent.doPageChange).toHaveBeenCalledWith(hoverPage);
-      });
-
-      it('should send out a saveMoveFieldUpdate with the correct values', () => {
-        expect(objectUpdatesService.saveMoveFieldUpdate).toHaveBeenCalledWith(url, event.previousIndex, 0, 0, hoverPage - 1, object1);
+      it('should send out a dropObject event with the expected processed paginated indexes', () => {
+        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
+          fromIndex: ((component.currentPage$.value - 1) * component.pageSize) + event.previousIndex,
+          toIndex: ((hoverPage - 1) * component.pageSize),
+          finish: jasmine.anything()
+        }));
       });
     });
 
     describe('when the user is not hovering over a new page', () => {
       beforeEach(() => {
+        spyOn(component.dropObject, 'emit');
         component.drop(event);
       });
 
-      it('should send out a saveMoveFieldUpdate with the correct values', () => {
-        expect(objectUpdatesService.saveMoveFieldUpdate).toHaveBeenCalledWith(url, event.previousIndex, event.currentIndex, 0, 0);
+      it('should send out a dropObject event with the expected properties', () => {
+        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
+          fromIndex: event.previousIndex,
+          toIndex: event.currentIndex,
+          finish: jasmine.anything()
+        }));
       });
     });
   });
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
index a34b5d5bc0c..95593163334 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
@@ -1,23 +1,37 @@
-import { FieldUpdates } from '../../core/data/object-updates/object-updates.reducer';
+import { FieldUpdate, FieldUpdates } from '../../core/data/object-updates/object-updates.reducer';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { switchMap, take, tap } from 'rxjs/operators';
-import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { paginatedListToArray } from '../../core/shared/operators';
+import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
+import { hasValue } from '../empty.util';
+import {
+  paginatedListToArray,
+  getFirstSucceededRemoteData,
+  getAllSucceededRemoteData
+} from '../../core/shared/operators';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { CdkDragDrop } from '@angular/cdk/drag-drop';
-import { ElementRef, ViewChild } from '@angular/core';
+import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
 import { PaginationComponent } from '../pagination/pagination.component';
+import { ObjectValuesPipe } from '../utils/object-values-pipe';
+import { compareArraysUsing } from '../../+item-page/simple/item-types/shared/item-relationships-utils';
+import { Subscription } from 'rxjs/internal/Subscription';
+
+/**
+ * Operator used for comparing {@link FieldUpdate}s by their field's UUID
+ */
+export const compareArraysUsingFieldUuids = () =>
+  compareArraysUsing((fieldUpdate: FieldUpdate) => (hasValue(fieldUpdate) && hasValue(fieldUpdate.field)) ? fieldUpdate.field.uuid : undefined);
 
 /**
  * An abstract component containing general methods and logic to be able to drag and drop objects within a paginated
  * list. This implementation supports being able to drag and drop objects between pages.
- * Dragging an object on top of a page number will automatically detect the page it's being dropped on, send an update
- * to the store and add the object on top of that page.
+ * Dragging an object on top of a page number will automatically detect the page it's being dropped on and send a
+ * dropObject event to the parent component containing detailed information about the indexes the object was dropped from
+ * and to.
  *
  * To extend this component, it is important to make sure to:
  * - Initialize objectsRD$ within the initializeObjectsRD() method
@@ -28,12 +42,19 @@ import { PaginationComponent } from '../pagination/pagination.component';
  *
  * An example component extending from this abstract component: PaginatedDragAndDropBitstreamListComponent
  */
-export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> {
+export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
   /**
    * A view on the child pagination component
    */
   @ViewChild(PaginationComponent, {static: false}) paginationComponent: PaginationComponent;
 
+  /**
+   * Send an event when the user drops an object on the pagination
+   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
+   * not just within a single page)
+   */
+  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
+
   /**
    * The URL to use for accessing the object updates from this list
    */
@@ -49,6 +70,12 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
    */
   updates$: Observable<FieldUpdates>;
 
+  /**
+   * A list of object UUIDs
+   * This is the order the objects will be displayed in
+   */
+  customOrder: string[];
+
   /**
    * The amount of objects to display per page
    */
@@ -70,23 +97,21 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   currentPage$ = new BehaviorSubject<number>(1);
 
   /**
-   * A list of pages that have been initialized in the field-update store
+   * Whether or not we should display a loading animation
+   * This is used to display a loading page when the user drops a bitstream onto a new page. The loading animation
+   * should stop once the bitstream has moved to the new page and the new page's response has loaded and contains the
+   * dropped object on top (see this.stopLoadingWhenFirstIs below)
    */
-  initializedPages: number[] = [];
+  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
-   * An object storing information about an update that should be fired whenever fireToUpdate is called
+   * List of subscriptions
    */
-  toUpdate: {
-    fromIndex: number,
-    toIndex: number,
-    fromPage: number,
-    toPage: number,
-    field?: T
-  };
+  subs: Subscription[] = [];
 
   protected constructor(protected objectUpdatesService: ObjectUpdatesService,
-                        protected elRef: ElementRef) {
+                        protected elRef: ElementRef,
+                        protected objectValuesPipe: ObjectValuesPipe) {
   }
 
   /**
@@ -110,28 +135,30 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
 
   /**
    * Initialize the field-updates in the store
-   * This method ensures (new) pages displayed are automatically added to the field-update store when the objectsRD updates
    */
   initializeUpdates(): void {
+    this.objectsRD$.pipe(
+      getFirstSucceededRemoteData(),
+      paginatedListToArray(),
+    ).subscribe((objects: T[]) => {
+      this.objectUpdatesService.initialize(this.url, objects, new Date());
+    });
     this.updates$ = this.objectsRD$.pipe(
+      getAllSucceededRemoteData(),
       paginatedListToArray(),
-      tap((objects: T[]) => {
-        // Pages in the field-update store are indexed starting at 0 (because they're stored in an array of pages)
-        const updatesPage = this.currentPage$.value - 1;
-        if (isEmpty(this.initializedPages)) {
-          // No updates have been initialized yet for this list, initialize the first page
-          this.objectUpdatesService.initializeWithCustomOrder(this.url, objects, new Date(), this.pageSize, updatesPage);
-          this.initializedPages.push(updatesPage);
-        } else if (this.initializedPages.indexOf(updatesPage) < 0) {
-          // Updates were initialized for this list, but not the page we're on. Add the current page to the field-update store for this list
-          this.objectUpdatesService.addPageToCustomOrder(this.url, objects, updatesPage);
-          this.initializedPages.push(updatesPage);
-        }
-
-        // The new page is loaded into the store, check if there are any updates waiting and fire those as well
-        this.fireToUpdate();
+      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects))
+    );
+    this.subs.push(
+      this.updates$.pipe(
+        map((fieldUpdates) => this.objectValuesPipe.transform(fieldUpdates)),
+        distinctUntilChanged(compareArraysUsingFieldUuids())
+      ).subscribe((updateValues) => {
+        this.customOrder = updateValues.map((fieldUpdate) => fieldUpdate.field.uuid);
+        // We received new values, stop displaying a loading indicator if it's present
+        this.loading$.next(false);
       }),
-      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesByCustomOrder(this.url, objects, this.currentPage$.value - 1))
+      // Disable the pagination when objects are loading
+      this.loading$.subscribe((loading) => this.options.disabled = loading)
     );
   }
 
@@ -144,52 +171,60 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   }
 
   /**
-   * An object was moved, send updates to the store.
+   * An object was moved, send updates to the dropObject EventEmitter
    * When the object is dropped on a page within the pagination of this component, the object moves to the top of that
-   * page and the pagination automatically loads and switches the view to that page.
+   * page and the pagination automatically loads and switches the view to that page (this is done by calling the event's
+   * finish() method after sending patch requests to the REST API)
    * @param event
    */
   drop(event: CdkDragDrop<any>) {
+    const dragIndex = event.previousIndex;
+    let dropIndex = event.currentIndex;
+    const dragPage = this.currentPage$.value - 1;
+    let dropPage = this.currentPage$.value - 1;
+
     // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
     const droppedOnElement = this.elRef.nativeElement.querySelector('.page-item:hover');
     if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent)) {
       // The user is hovering over a page, fetch the page's number from the element
-      const page = Number(droppedOnElement.textContent);
-      if (hasValue(page) && !Number.isNaN(page)) {
-        const id = event.item.element.nativeElement.id;
-        this.updates$.pipe(take(1)).subscribe((updates: FieldUpdates) => {
-          const field = hasValue(updates[id]) ? updates[id].field : undefined;
-          this.toUpdate = Object.assign({
-            fromIndex: event.previousIndex,
-            toIndex: 0,
-            fromPage: this.currentPage$.value - 1,
-            toPage: page - 1,
-            field
-          });
-          // Switch to the dropped-on page and force a page update for the pagination component
-          this.currentPage$.next(page);
-          this.paginationComponent.doPageChange(page);
-          if (this.initializedPages.indexOf(page - 1) >= 0) {
-            // The page the object is being dropped to has already been loaded before, directly fire an update to the store.
-            // For pages that haven't been loaded before, the updates$ observable will call fireToUpdate after the new page
-            // has loaded
-            this.fireToUpdate();
-          }
-        });
+      const droppedPage = Number(droppedOnElement.textContent);
+      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
+        dropPage = droppedPage - 1;
+        dropIndex = 0;
       }
-    } else {
-      this.objectUpdatesService.saveMoveFieldUpdate(this.url, event.previousIndex, event.currentIndex, this.currentPage$.value - 1, this.currentPage$.value - 1);
+    }
+
+    const isNewPage = dragPage !== dropPage;
+    // Move the object in the custom order array if the drop happened within the same page
+    // This allows us to instantly display a change in the order, instead of waiting for the REST API's response first
+    if (!isNewPage && dragIndex !== dropIndex) {
+      moveItemInArray(this.customOrder, dragIndex, dropIndex);
+    }
+
+    const redirectPage = dropPage + 1;
+    const fromIndex = (dragPage * this.pageSize) + dragIndex;
+    const toIndex = (dropPage * this.pageSize) + dropIndex;
+    // Send out a drop event (and navigate to the new page) when the "from" and "to" indexes are different from each other
+    if (fromIndex !== toIndex) {
+      if (isNewPage) {
+        this.loading$.next(true);
+      }
+      this.dropObject.emit(Object.assign({
+        fromIndex,
+        toIndex,
+        finish: () => {
+          if (isNewPage) {
+            this.paginationComponent.doPageChange(redirectPage);
+          }
+        }
+      }));
     }
   }
 
   /**
-   * Method checking if there's an update ready to be fired. Send out a MoveFieldUpdate to the store if there's an
-   * update present and clear the update afterwards.
+   * unsub all subscriptions
    */
-  fireToUpdate() {
-    if (hasValue(this.toUpdate)) {
-      this.objectUpdatesService.saveMoveFieldUpdate(this.url, this.toUpdate.fromIndex, this.toUpdate.toIndex, this.toUpdate.fromPage, this.toUpdate.toPage, this.toUpdate.field);
-      this.toUpdate = undefined;
-    }
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 }
diff --git a/src/app/shared/pagination/pagination.utils.ts b/src/app/shared/pagination/pagination.utils.ts
new file mode 100644
index 00000000000..5701c96b54c
--- /dev/null
+++ b/src/app/shared/pagination/pagination.utils.ts
@@ -0,0 +1,14 @@
+import { PaginationComponentOptions } from './pagination-component-options.model';
+import { FindListOptions } from '../../core/data/request.models';
+
+/**
+ * Transform a PaginationComponentOptions object into a FindListOptions object
+ * @param pagination  The PaginationComponentOptions to transform
+ * @param original    An original FindListOptions object to start from
+ */
+export function toFindListOptions(pagination: PaginationComponentOptions, original?: FindListOptions): FindListOptions {
+  return Object.assign(new FindListOptions(), original, {
+    currentPage: pagination.currentPage,
+    elementsPerPage: pagination.pageSize
+  });
+}
diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts
index ce278e02290..9d4812d2a53 100644
--- a/src/app/shared/remote-data.utils.ts
+++ b/src/app/shared/remote-data.utils.ts
@@ -1,71 +1,105 @@
 import { RemoteData } from '../core/data/remote-data';
 import { Observable, of as observableOf } from 'rxjs';
-import { RemoteDataError } from '../core/data/remote-data-error';
+import { environment } from '../../environments/environment';
+import { RequestEntryState } from '../core/data/request.reducer';
+
+/**
+ * A fixed timestamp to use in tests
+ */
+const FIXED_TIMESTAMP = new Date().getTime();
 
 /**
  * Method to create a remote data object that has succeeded
  * @param object The object to wrap
+ * @param timeCompleted the moment when the remoteData was completed
  */
-export function createSuccessfulRemoteDataObject<T>(object: T): RemoteData<T> {
+export function createSuccessfulRemoteDataObject<T>(object: T, timeCompleted = FIXED_TIMESTAMP): RemoteData<T> {
   return new RemoteData(
-    false,
-    false,
-    true,
+    timeCompleted,
+    environment.cache.msToLive.default,
+    timeCompleted,
+    RequestEntryState.Success,
     undefined,
-    object
+    object,
+    200
   );
 }
 
 /**
  * Method to create a remote data object that has succeeded, wrapped in an observable
  * @param object The object to wrap
+ * @param timeCompleted the moment when the remoteData was completed
  */
-export function createSuccessfulRemoteDataObject$<T>(object: T): Observable<RemoteData<T>> {
-  return observableOf(createSuccessfulRemoteDataObject(object));
+export function createSuccessfulRemoteDataObject$<T>(object: T, timeCompleted?: number): Observable<RemoteData<T>> {
+  return observableOf(createSuccessfulRemoteDataObject(object, timeCompleted));
 }
 
 /**
  * Method to create a remote data object that has failed
- * @param object The object to wrap
- * @param error The RemoteDataError that caused the failure
+ *
+ * @param errorMessage  the error message
+ * @param statusCode    the status code
+ * @param timeCompleted the moment when the remoteData was completed
  */
-export function createFailedRemoteDataObject<T>(object?: T, error?: RemoteDataError): RemoteData<T> {
+export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCode?: number, timeCompleted = 1577836800000): RemoteData<T> {
   return new RemoteData(
-    false,
-    false,
-    false,
-    error,
-    object
+    timeCompleted,
+    environment.cache.msToLive.default,
+    timeCompleted,
+    RequestEntryState.Error,
+    errorMessage,
+    undefined,
+    statusCode
   );
 }
 
 /**
  * Method to create a remote data object that has failed, wrapped in an observable
- * @param object The object to wrap
- * @param error The RemoteDataError that caused the failure
+ *
+ * @param errorMessage  the error message
+ * @param statusCode    the status code
+ * @param timeCompleted the moment when the remoteData was completed
  */
-export function createFailedRemoteDataObject$<T>(object?: T, error?: RemoteDataError): Observable<RemoteData<T>> {
-  return observableOf(createFailedRemoteDataObject(object, error));
+export function createFailedRemoteDataObject$<T>(errorMessage?: string, statusCode?: number, timeCompleted?: number): Observable<RemoteData<T>> {
+  return observableOf(createFailedRemoteDataObject(errorMessage, statusCode, timeCompleted));
 }
 
 /**
  * Method to create a remote data object that is still pending
- * @param object The object to wrap
+ * @param lastVerified the moment when the remoteData was last verified
  */
-export function createPendingRemoteDataObject<T>(object?: T): RemoteData<T> {
+export function createPendingRemoteDataObject<T>(lastVerified = FIXED_TIMESTAMP): RemoteData<T> {
   return new RemoteData(
-    true,
-    true,
-    true,
-    null,
-    object
+    undefined,
+    environment.cache.msToLive.default,
+    lastVerified,
+    RequestEntryState.ResponsePending,
+    undefined,
+    undefined,
+    undefined
   );
 }
 
 /**
  * Method to create a remote data object that is still pending, wrapped in an observable
- * @param object The object to wrap
+ * @param lastVerified the moment when the remoteData was last verified
+ */
+export function createPendingRemoteDataObject$<T>(lastVerified?: number): Observable<RemoteData<T>> {
+  return observableOf(createPendingRemoteDataObject(lastVerified));
+}
+
+/**
+ * Method to create a remote data object with no content
+ * @param timeCompleted the moment when the remoteData was completed
+ */
+export function createNoContentRemoteDataObject<T>(timeCompleted?: number): RemoteData<T> {
+  return createSuccessfulRemoteDataObject(undefined, timeCompleted);
+}
+
+/**
+ * Method to create a remote data object that has succeeded with no content, wrapped in an observable
+ * @param timeCompleted the moment when the remoteData was completed
  */
-export function createPendingRemoteDataObject$<T>(object?: T): Observable<RemoteData<T>> {
-  return observableOf(createPendingRemoteDataObject(object));
+export function createNoContentRemoteDataObject$<T>(timeCompleted?: number): Observable<RemoteData<T>> {
+  return createSuccessfulRemoteDataObject$(undefined, timeCompleted)
 }
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.html b/src/app/shared/resource-policies/create/resource-policy-create.component.html
new file mode 100644
index 00000000000..85d0d13e96c
--- /dev/null
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.html
@@ -0,0 +1,7 @@
+<div class="container">
+  <h4 class="mb-3">{{'resource-policies.create.page.heading' | translate}} {{targetResourceName}}</h4>
+
+  <ds-resource-policy-form [isProcessing]="isProcessing()"
+                           (reset)="redirectToAuthorizationsPage()"
+                           (submit)="createResourcePolicy($event)"></ds-resource-policy-form>
+</div>
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
new file mode 100644
index 00000000000..d11e884d7b0
--- /dev/null
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
@@ -0,0 +1,269 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { cold, getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../remote-data.utils';
+import { createPaginatedList, createTestComponent } from '../../testing/utils.test';
+import { ResourcePolicyCreateComponent } from './resource-policy-create.component';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
+import { getMockLinkService } from '../../mocks/link-service.mock';
+import { RouterStub } from '../../testing/router.stub';
+import { Item } from '../../../core/shared/item.model';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { GroupMock } from '../../testing/group-mock';
+import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { EPersonMock } from '../../testing/eperson.mock';
+
+describe('ResourcePolicyCreateComponent test suite', () => {
+  let comp: ResourcePolicyCreateComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<ResourcePolicyCreateComponent>;
+  let de;
+  let scheduler: TestScheduler;
+  let eventPayload: ResourcePolicyEvent;
+
+  const resourcePolicy: any = {
+    id: '1',
+    name: null,
+    description: null,
+    policyType: PolicyType.TYPE_SUBMISSION,
+    action: ActionType.READ,
+    startDate: null,
+    endDate: null,
+    type: 'resourcepolicy',
+    uuid: 'resource-policy-1',
+    _links: {
+      eperson: {
+        href: 'https://rest.api/rest/api/eperson'
+      },
+      group: {
+        href: 'https://rest.api/rest/api/group'
+      },
+      self: {
+        href: 'https://rest.api/rest/api/resourcepolicies/1'
+      },
+    },
+    eperson: observableOf(createSuccessfulRemoteDataObject({})),
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+  };
+
+  const item = Object.assign(new Item(), {
+    uuid: 'itemUUID',
+    id: 'itemUUID',
+    metadata: {
+      'dc.title': [{
+        value: 'test item'
+      }]
+    },
+    _links: {
+      self: { href: 'item-selflink' }
+    },
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([]))
+  });
+
+  const resourcePolicyService: any = getMockResourcePolicyService();
+  const linkService: any = getMockLinkService();
+  const routeStub = {
+    data: observableOf({
+      resourcePolicyTarget: createSuccessfulRemoteDataObject(item)
+    })
+  };
+  const routerStub = Object.assign(new RouterStub(), {
+    url: `url/edit`
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        ResourcePolicyCreateComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: LinkService, useValue: linkService },
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: Router, useValue: routerStub },
+        ResourcePolicyCreateComponent,
+        ChangeDetectorRef,
+        Injector
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-resource-policy-create></ds-resource-policy-create>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create ResourcePolicyCreateComponent', inject([ResourcePolicyCreateComponent], (app: ResourcePolicyCreateComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('', () => {
+
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(ResourcePolicyCreateComponent);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should init component properly', (done) => {
+      fixture.detectChanges();
+      expect(compAsAny.targetResourceUUID).toBe('itemUUID');
+      expect(compAsAny.targetResourceName).toBe('test item');
+      done();
+    });
+
+    it('should redirect to authorizations page', (done) => {
+      comp.redirectToAuthorizationsPage();
+      expect(compAsAny.router.navigate).toHaveBeenCalled();
+      done();
+    });
+
+    it('should return true when is Processing', (done) => {
+      compAsAny.processing$.next(true);
+      expect(comp.isProcessing()).toBeObservable(cold('a', {
+        a: true
+      }));
+      done();
+    });
+
+    it('should return false when is not Processing', (done) => {
+      compAsAny.processing$.next(false);
+      expect(comp.isProcessing()).toBeObservable(cold('a', {
+        a: false
+      }));
+      done();
+    });
+
+    describe('when target type is group', () => {
+      beforeEach(() => {
+        spyOn(comp, 'redirectToAuthorizationsPage').and.callThrough();
+
+        compAsAny.targetResourceUUID = 'itemUUID';
+
+        eventPayload = Object.create({});
+        eventPayload.object = submittedResourcePolicy;
+        eventPayload.target = {
+          type: 'group',
+          uuid: GroupMock.id
+        };
+      });
+
+      it('should notify success when creation is successful', () => {
+        compAsAny.resourcePolicyService.create.and.returnValue(observableOf(createSuccessfulRemoteDataObject(resourcePolicy)));
+
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.createResourcePolicy(eventPayload));
+        scheduler.flush();
+
+        expect(compAsAny.resourcePolicyService.create).toHaveBeenCalledWith(eventPayload.object, 'itemUUID', null, eventPayload.target.uuid);
+        expect(comp.redirectToAuthorizationsPage).toHaveBeenCalled();
+      });
+
+      it('should notify error when creation is not successful', () => {
+        compAsAny.resourcePolicyService.create.and.returnValue(observableOf(createFailedRemoteDataObject()));
+
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.createResourcePolicy(eventPayload));
+        scheduler.flush();
+
+        expect(compAsAny.resourcePolicyService.create).toHaveBeenCalledWith(eventPayload.object, 'itemUUID', null, eventPayload.target.uuid);
+        expect(comp.redirectToAuthorizationsPage).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when target type of created policy is eperson', () => {
+
+      beforeEach(() => {
+        spyOn(comp, 'redirectToAuthorizationsPage').and.callThrough();
+
+        compAsAny.targetResourceUUID = 'itemUUID';
+
+        eventPayload = Object.create({});
+        eventPayload.object = submittedResourcePolicy;
+        eventPayload.target = {
+          type: 'eperson',
+          uuid: EPersonMock.id
+        };
+      });
+
+      it('should notify success when creation is successful', () => {
+        compAsAny.resourcePolicyService.create.and.returnValue(observableOf(createSuccessfulRemoteDataObject(resourcePolicy)));
+
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.createResourcePolicy(eventPayload));
+        scheduler.flush();
+
+        expect(compAsAny.resourcePolicyService.create).toHaveBeenCalledWith(eventPayload.object, 'itemUUID', eventPayload.target.uuid);
+        expect(comp.redirectToAuthorizationsPage).toHaveBeenCalled();
+      });
+
+      it('should notify error when creation is not successful', () => {
+        compAsAny.resourcePolicyService.create.and.returnValue(observableOf(createFailedRemoteDataObject()));
+
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.createResourcePolicy(eventPayload));
+        scheduler.flush();
+
+        expect(compAsAny.resourcePolicyService.create).toHaveBeenCalledWith(eventPayload.object, 'itemUUID', eventPayload.target.uuid);
+        expect(comp.redirectToAuthorizationsPage).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
new file mode 100644
index 00000000000..62ee0769d0c
--- /dev/null
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
@@ -0,0 +1,113 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { BehaviorSubject, Observable } from 'rxjs';
+import { map, take } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../+item-page/edit-item-page/edit-item-page.routing-paths';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-resource-policy-create',
+  templateUrl: './resource-policy-create.component.html'
+})
+export class ResourcePolicyCreateComponent implements OnInit {
+
+  /**
+   * The name of the resource target of the policy
+   */
+  public targetResourceName: string;
+
+  /**
+   * A boolean representing if a submission creation operation is pending
+   * @type {BehaviorSubject<boolean>}
+   */
+  private processing$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The uuid of the resource target of the policy
+   */
+  private targetResourceUUID: string;
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {DSONameService} dsoNameService
+   * @param {NotificationsService} notificationsService
+   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ActivatedRoute} route
+   * @param {Router} router
+   * @param {TranslateService} translate
+   */
+  constructor(
+    private dsoNameService: DSONameService,
+    private notificationsService: NotificationsService,
+    private resourcePolicyService: ResourcePolicyService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private translate: TranslateService) {
+  }
+
+  /**
+   * Initialize the component
+   */
+  ngOnInit(): void {
+    this.route.data.pipe(
+      map((data) => data),
+      take(1)
+    ).subscribe((data: any) => {
+      this.targetResourceUUID = (data.resourcePolicyTarget as RemoteData<DSpaceObject>).payload.id;
+      this.targetResourceName = this.dsoNameService.getName((data.resourcePolicyTarget as RemoteData<DSpaceObject>).payload);
+    });
+  }
+
+  /**
+   * Return a boolean representing if an operation is pending
+   *
+   * @return {Observable<boolean>}
+   */
+  isProcessing(): Observable<boolean> {
+    return this.processing$.asObservable();
+  }
+
+  /**
+   * Redirect to the authorizations page
+   */
+  redirectToAuthorizationsPage(): void {
+    this.router.navigate([`../../${ITEM_EDIT_AUTHORIZATIONS_PATH}`], { relativeTo: this.route });
+  }
+
+  /**
+   * Create a new resource policy
+   *
+   * @param event The {{ResourcePolicyEvent}} emitted
+   */
+  createResourcePolicy(event: ResourcePolicyEvent): void {
+    this.processing$.next(true);
+    let response$;
+    if (event.target.type === 'eperson') {
+      response$ = this.resourcePolicyService.create(event.object, this.targetResourceUUID, event.target.uuid);
+    } else {
+      response$ = this.resourcePolicyService.create(event.object, this.targetResourceUUID, null, event.target.uuid);
+    }
+    response$.pipe(
+      getFirstCompletedRemoteData()
+    ).subscribe((responseRD: RemoteData<ResourcePolicy>) => {
+      this.processing$.next(false);
+      if (responseRD.hasSucceeded) {
+        this.notificationsService.success(null, this.translate.get('resource-policies.create.page.success.content'));
+        this.redirectToAuthorizationsPage();
+      } else {
+        this.notificationsService.error(null, this.translate.get('resource-policies.create.page.failure.content'));
+      }
+    })
+  }
+}
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.html b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
new file mode 100644
index 00000000000..0f285c49489
--- /dev/null
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
@@ -0,0 +1,8 @@
+<div class="container">
+  <h4 class="mb-3">{{'resource-policies.edit.page.heading' | translate}} {{resourcePolicy.id}}</h4>
+
+  <ds-resource-policy-form [resourcePolicy]="resourcePolicy"
+                           [isProcessing]="isProcessing()"
+                           (reset)="redirectToAuthorizationsPage()"
+                           (submit)="updateResourcePolicy($event)"></ds-resource-policy-form>
+</div>
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
new file mode 100644
index 00000000000..c0ea12f17ff
--- /dev/null
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
@@ -0,0 +1,224 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { cold, getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject
+} from '../../remote-data.utils';
+import { createTestComponent } from '../../testing/utils.test';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
+import { getMockLinkService } from '../../mocks/link-service.mock';
+import { RouterStub } from '../../testing/router.stub';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { GroupMock } from '../../testing/group-mock';
+import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { ResourcePolicyEditComponent } from './resource-policy-edit.component';
+import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+
+describe('ResourcePolicyEditComponent test suite', () => {
+  let comp: ResourcePolicyEditComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<ResourcePolicyEditComponent>;
+  let de;
+  let scheduler: TestScheduler;
+  let eventPayload: ResourcePolicyEvent;
+  let updatedObject;
+
+  const resourcePolicy: any = {
+    id: '1',
+    name: null,
+    description: null,
+    policyType: PolicyType.TYPE_SUBMISSION,
+    action: ActionType.READ,
+    startDate: null,
+    endDate: null,
+    type: 'resourcepolicy',
+    uuid: 'resource-policy-1',
+    _links: {
+      eperson: {
+        href: 'https://rest.api/rest/api/eperson'
+      },
+      group: {
+        href: 'https://rest.api/rest/api/group'
+      },
+      self: {
+        href: 'https://rest.api/rest/api/resourcepolicies/1'
+      },
+    },
+    eperson: observableOf(createSuccessfulRemoteDataObject({})),
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+  };
+
+  const resourcePolicyService: any = getMockResourcePolicyService();
+  const linkService: any = getMockLinkService();
+  const routeStub = {
+    data: observableOf({
+      resourcePolicy: createSuccessfulRemoteDataObject(resourcePolicy)
+    })
+  };
+  const routerStub = Object.assign(new RouterStub(), {
+    url: `url/edit`
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        ResourcePolicyEditComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: LinkService, useValue: linkService },
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: Router, useValue: routerStub },
+        ResourcePolicyEditComponent,
+        ChangeDetectorRef,
+        Injector
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-resource-policy-edit></ds-resource-policy-edit>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create ResourcePolicyEditComponent', inject([ResourcePolicyEditComponent], (app: ResourcePolicyEditComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('', () => {
+
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(ResourcePolicyEditComponent);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should init component properly', (done) => {
+      fixture.detectChanges();
+      expect(compAsAny.resourcePolicy).toEqual(resourcePolicy);
+      done();
+    });
+
+    it('should redirect to authorizations page', (done) => {
+      comp.redirectToAuthorizationsPage();
+      expect(compAsAny.router.navigate).toHaveBeenCalled();
+      done();
+    });
+
+    it('should return true when is Processing', (done) => {
+      compAsAny.processing$.next(true);
+      expect(comp.isProcessing()).toBeObservable(cold('a', {
+        a: true
+      }));
+      done();
+    });
+
+    it('should return false when is not Processing', (done) => {
+      compAsAny.processing$.next(false);
+      expect(comp.isProcessing()).toBeObservable(cold('a', {
+        a: false
+      }));
+      done();
+    });
+
+    describe('', () => {
+      beforeEach(() => {
+        spyOn(comp, 'redirectToAuthorizationsPage').and.callThrough();
+        compAsAny.resourcePolicyService.update.and.returnValue(observableOf(createSuccessfulRemoteDataObject(resourcePolicy)));
+
+        compAsAny.targetResourceUUID = 'itemUUID';
+
+        eventPayload = Object.create({});
+        eventPayload.object = submittedResourcePolicy;
+        eventPayload.target = {
+          type: 'group',
+          uuid: GroupMock.id
+        };
+
+        compAsAny.resourcePolicy = resourcePolicy;
+
+        updatedObject = Object.assign({}, submittedResourcePolicy, {
+          id: resourcePolicy.id,
+          type: RESOURCE_POLICY.value,
+          _links: resourcePolicy._links
+        });
+      });
+
+      it('should notify success when update is successful', () => {
+        compAsAny.resourcePolicyService.update.and.returnValue(observableOf(createSuccessfulRemoteDataObject(resourcePolicy)));
+
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.updateResourcePolicy(eventPayload));
+        scheduler.flush();
+
+        expect(compAsAny.resourcePolicyService.update).toHaveBeenCalledWith(updatedObject);
+        expect(comp.redirectToAuthorizationsPage).toHaveBeenCalled();
+      });
+
+      it('should notify error when update is not successful', () => {
+        compAsAny.resourcePolicyService.update.and.returnValue(observableOf(createFailedRemoteDataObject()));
+
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.updateResourcePolicy(eventPayload));
+        scheduler.flush();
+
+        expect(compAsAny.resourcePolicyService.update).toHaveBeenCalledWith(updatedObject);
+        expect(comp.redirectToAuthorizationsPage).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
new file mode 100644
index 00000000000..47021499891
--- /dev/null
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
@@ -0,0 +1,103 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { BehaviorSubject, Observable } from 'rxjs';
+import { map, take } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+
+import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../+item-page/edit-item-page/edit-item-page.routing-paths';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-resource-policy-edit',
+  templateUrl: './resource-policy-edit.component.html'
+})
+export class ResourcePolicyEditComponent implements OnInit {
+
+  /**
+   * The resource policy object to edit
+   */
+  public resourcePolicy: ResourcePolicy;
+
+  /**
+   * A boolean representing if a submission editing operation is pending
+   * @type {BehaviorSubject<boolean>}
+   */
+  private processing$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {NotificationsService} notificationsService
+   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ActivatedRoute} route
+   * @param {Router} router
+   * @param {TranslateService} translate
+   */
+  constructor(
+    private notificationsService: NotificationsService,
+    private resourcePolicyService: ResourcePolicyService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private translate: TranslateService) {
+  }
+
+  /**
+   * Initialize the component
+   */
+  ngOnInit(): void {
+    this.route.data.pipe(
+      map((data) => data),
+      take(1)
+    ).subscribe((data: any) => {
+      this.resourcePolicy = (data.resourcePolicy as RemoteData<ResourcePolicy>).payload;
+    });
+  }
+
+  /**
+   * Return a boolean representing if an operation is pending
+   *
+   * @return {Observable<boolean>}
+   */
+  isProcessing(): Observable<boolean> {
+    return this.processing$.asObservable();
+  }
+
+  /**
+   * Redirect to the authorizations page
+   */
+  redirectToAuthorizationsPage() {
+    this.router.navigate([`../../${ITEM_EDIT_AUTHORIZATIONS_PATH}`], { relativeTo: this.route });
+  }
+
+  /**
+   * Update a resource policy
+   *
+   * @param event The {{ResourcePolicyEvent}} emitted
+   */
+  updateResourcePolicy(event: ResourcePolicyEvent) {
+    this.processing$.next(true);
+    const updatedObject = Object.assign({}, event.object, {
+      id: this.resourcePolicy.id,
+      type: RESOURCE_POLICY.value,
+      _links: this.resourcePolicy._links
+    });
+    this.resourcePolicyService.update(updatedObject).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((responseRD: RemoteData<ResourcePolicy>) => {
+      this.processing$.next(false);
+      if (responseRD && responseRD.hasSucceeded) {
+        this.notificationsService.success(null, this.translate.get('resource-policies.edit.page.success.content'));
+        this.redirectToAuthorizationsPage();
+      } else {
+        this.notificationsService.error(null, this.translate.get('resource-policies.edit.page.failure.content'));
+      }
+    })
+  }
+}
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.html b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.html
new file mode 100644
index 00000000000..ce6eccb723c
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.html
@@ -0,0 +1,37 @@
+<div class="mt-3" @fadeInOut>
+  <ds-eperson-search-box *ngIf="isListOfEPerson" (search)="onSearch($event)"></ds-eperson-search-box>
+  <ds-group-search-box *ngIf="!isListOfEPerson" (search)="onSearch($event)"></ds-group-search-box>
+
+  <ds-pagination *ngIf="(getList() | async)?.payload?.totalElements > 0"
+                 [paginationOptions]="paginationOptions"
+                 [collectionSize]="(getList() | async)?.payload?.totalElements"
+                 [disableRouteParameterUpdate]="true"
+                 [hideGear]="true"
+                 (pageChange)="onPageChange($event)">
+
+    <div class="table-responsive">
+      <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+        <thead>
+        <tr class="text-center">
+          <th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th>
+          <th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th>
+          <th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let entry of (getList() | async)?.payload?.page"
+            [class.table-primary]="isSelected(entry) | async">
+          <td>{{entry.id}}</td>
+          <td>{{dsoNameService.getName(entry)}}</td>
+          <td class="text-center">
+            <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
+              {{'resource-policies.form.eperson-group-list.select.btn' | translate}}
+            </button>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+
+  </ds-pagination>
+</div>
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.scss b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts
new file mode 100644
index 00000000000..3e39df86ca3
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts
@@ -0,0 +1,287 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
+
+import { of as observableOf } from 'rxjs';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { uniqueId } from 'lodash';
+
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { createTestComponent } from '../../../testing/utils.test';
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { EpersonGroupListComponent, SearchEvent } from './eperson-group-list.component';
+import { EPersonMock } from '../../../testing/eperson.mock';
+import { GroupMock } from '../../../testing/group-mock';
+import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+describe('EpersonGroupListComponent test suite', () => {
+  let comp: EpersonGroupListComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<EpersonGroupListComponent>;
+  let de;
+  let groupService: any;
+  let epersonService: any;
+
+  const paginationOptions: PaginationComponentOptions = new PaginationComponentOptions()
+  paginationOptions.id = uniqueId('eperson-group-list-pagination-test');
+  paginationOptions.pageSize = 5;
+
+  const mockEpersonService = jasmine.createSpyObj('epersonService',
+    {
+      findByHref: jasmine.createSpy('findByHref'),
+      findAll: jasmine.createSpy('findAll'),
+      searchByScope: jasmine.createSpy('searchByScope'),
+    },
+    {
+      linkPath: 'epersons'
+    }
+  );
+
+  const mockGroupService = jasmine.createSpyObj('groupService',
+    {
+      findByHref: jasmine.createSpy('findByHref'),
+      findAll: jasmine.createSpy('findAll'),
+      searchGroups: jasmine.createSpy('searchGroups'),
+    },
+    {
+      linkPath: 'groups'
+    }
+  );
+
+  const epersonPaginatedList = buildPaginatedList(new PageInfo(), [EPersonMock, EPersonMock]);
+  const epersonPaginatedListRD = createSuccessfulRemoteDataObject(epersonPaginatedList);
+
+  const groupPaginatedList = buildPaginatedList(new PageInfo(), [GroupMock, GroupMock]);
+  const groupPaginatedListRD = createSuccessfulRemoteDataObject(groupPaginatedList);
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        NoopAnimationsModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        EpersonGroupListComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: EPersonDataService, useValue: mockEpersonService },
+        { provide: GroupDataService, useValue: mockGroupService },
+        { provide: RequestService, useValue: getMockRequestService() },
+        EpersonGroupListComponent,
+        ChangeDetectorRef,
+        Injector
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-eperson-group-list [isListOfEPerson]="isListOfEPerson" [initSelected]="initSelected"></ds-eperson-group-list>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create EpersonGroupListComponent', inject([EpersonGroupListComponent], (app: EpersonGroupListComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('when is list of eperson', () => {
+
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(EpersonGroupListComponent);
+      epersonService = TestBed.get(EPersonDataService);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+      comp.isListOfEPerson = true;
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should inject EPersonDataService', () => {
+      spyOn(comp, 'updateList');
+      fixture.detectChanges();
+
+      expect(compAsAny.dataService).toBeDefined();
+      expect(comp.updateList).toHaveBeenCalled();
+    });
+
+    it('should init entrySelectedId', () => {
+      spyOn(comp, 'updateList');
+      comp.initSelected = EPersonMock.id;
+
+      fixture.detectChanges();
+
+      expect(compAsAny.entrySelectedId.value).toBe(EPersonMock.id)
+    });
+
+    it('should init the list of eperson', () => {
+      epersonService.searchByScope.and.returnValue(observableOf(epersonPaginatedListRD));
+      fixture.detectChanges();
+
+      expect(compAsAny.list$.value).toEqual(epersonPaginatedListRD);
+      expect(comp.getList()).toBeObservable(cold('a', {
+        a: epersonPaginatedListRD
+      }));
+    });
+
+    it('should emit select event', () => {
+      spyOn(comp.select, 'emit');
+      comp.emitSelect(EPersonMock);
+
+      expect(comp.select.emit).toHaveBeenCalled();
+      expect(compAsAny.entrySelectedId.value).toBe(EPersonMock.id);
+    });
+
+    it('should return true when entry is selected', () => {
+      compAsAny.entrySelectedId.next(EPersonMock.id);
+
+      expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
+        a: true
+      }));
+    });
+
+    it('should return false when entry is not selected', () => {
+      compAsAny.entrySelectedId.next('');
+
+      expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
+        a: false
+      }));
+    });
+
+    it('should update list on page change', () => {
+      spyOn(comp, 'updateList');
+      comp.onPageChange(2);
+
+      expect(compAsAny.updateList).toHaveBeenCalled();
+    });
+  });
+
+  describe('when is list of group', () => {
+
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(EpersonGroupListComponent);
+      groupService = TestBed.get(GroupDataService);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+      comp.isListOfEPerson = false;
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should inject GroupDataService', () => {
+      spyOn(comp, 'updateList');
+      fixture.detectChanges();
+
+      expect(compAsAny.dataService).toBeDefined();
+      expect(comp.updateList).toHaveBeenCalled();
+    });
+
+    it('should init entrySelectedId', () => {
+      spyOn(comp, 'updateList');
+      comp.initSelected = GroupMock.id;
+
+      fixture.detectChanges();
+
+      expect(compAsAny.entrySelectedId.value).toBe(GroupMock.id)
+    });
+
+    it('should init the list of group', () => {
+      groupService.searchGroups.and.returnValue(observableOf(groupPaginatedListRD));
+      fixture.detectChanges();
+
+      expect(compAsAny.list$.value).toEqual(groupPaginatedListRD);
+      expect(comp.getList()).toBeObservable(cold('a', {
+        a: groupPaginatedListRD
+      }));
+    });
+
+    it('should emit select event', () => {
+      spyOn(comp.select, 'emit');
+      comp.emitSelect(GroupMock);
+
+      expect(comp.select.emit).toHaveBeenCalled();
+      expect(compAsAny.entrySelectedId.value).toBe(GroupMock.id);
+    });
+
+    it('should return true when entry is selected', () => {
+      compAsAny.entrySelectedId.next(EPersonMock.id);
+
+      expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
+        a: true
+      }));
+    });
+
+    it('should return false when entry is not selected', () => {
+      compAsAny.entrySelectedId.next('');
+
+      expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
+        a: false
+      }));
+    });
+
+    it('should update list on page change', () => {
+      spyOn(comp, 'updateList');
+      comp.onPageChange(2);
+
+      expect(compAsAny.updateList).toHaveBeenCalled();
+    });
+
+    it('should update list on search triggered', () => {
+      const options: PaginationComponentOptions = comp.paginationOptions
+      const event: SearchEvent = {
+        scope: 'metadata',
+        query: 'test'
+      }
+      spyOn(comp, 'updateList');
+      comp.onSearch(event);
+
+      expect(compAsAny.updateList).toHaveBeenCalledWith(options, 'metadata', 'test');
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+  isListOfEPerson = true;
+  initSelected = '';
+}
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
new file mode 100644
index 00000000000..2e4dac69d41
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
@@ -0,0 +1,202 @@
+import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } from '@angular/core';
+
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { uniqueId } from 'lodash'
+
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
+import { DataService } from '../../../../core/data/data.service';
+import { hasValue, isNotEmpty } from '../../../empty.util';
+import { FindListOptions } from '../../../../core/data/request.models';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { getDataServiceFor } from '../../../../core/cache/builders/build-decorators';
+import { EPERSON } from '../../../../core/eperson/models/eperson.resource-type';
+import { GROUP } from '../../../../core/eperson/models/group.resource-type';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { fadeInOut } from '../../../animations/fade';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+
+export interface SearchEvent {
+  scope: string;
+  query: string
+}
+
+@Component({
+  selector: 'ds-eperson-group-list',
+  styleUrls: ['./eperson-group-list.component.scss'],
+  templateUrl: './eperson-group-list.component.html',
+  animations: [
+    fadeInOut
+  ]
+})
+/**
+ * Component that shows a list of eperson or group
+ */
+export class EpersonGroupListComponent implements OnInit, OnDestroy {
+
+  /**
+   * A boolean representing id component should list eperson or group
+   */
+  @Input() isListOfEPerson = true;
+
+  /**
+   * The uuid of eperson or group initially selected
+   */
+  @Input() initSelected: string;
+
+  /**
+   * An event fired when a eperson or group is selected.
+   * Event's payload equals to DSpaceObject.
+   */
+  @Output() select: EventEmitter<DSpaceObject> = new EventEmitter<DSpaceObject>();
+
+  /**
+   * Current search query
+   */
+  public currentSearchQuery = '';
+
+  /**
+   * Current search scope
+   */
+  public currentSearchScope = 'metadata';
+
+  /**
+   * Pagination config used to display the list
+   */
+  public paginationOptions: PaginationComponentOptions = new PaginationComponentOptions();
+
+  /**
+   * The data service used to make request.
+   * It could be EPersonDataService or GroupDataService
+   */
+  private dataService: DataService<DSpaceObject>;
+
+  /**
+   * A list of eperson or group
+   */
+  private list$: BehaviorSubject<RemoteData<PaginatedList<DSpaceObject>>> = new BehaviorSubject<RemoteData<PaginatedList<DSpaceObject>>>({} as any);
+
+  /**
+   * The eperson or group's id selected
+   * @type {string}
+   */
+  private entrySelectedId: BehaviorSubject<string> = new BehaviorSubject<string>('');
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables and inject the properly DataService
+   *
+   * @param {DSONameService} dsoNameService
+   * @param {Injector} parentInjector
+   */
+  constructor(public dsoNameService: DSONameService, private parentInjector: Injector) {
+  }
+
+  /**
+   * Initialize the component
+   */
+  ngOnInit(): void {
+    const resourceType: ResourceType = (this.isListOfEPerson) ? EPERSON : GROUP;
+    const provider = getDataServiceFor(resourceType);
+    this.dataService = Injector.create({
+      providers: [],
+      parent: this.parentInjector
+    }).get(provider);
+    this.paginationOptions.id = uniqueId('eperson-group-list-pagination');
+    this.paginationOptions.pageSize = 5;
+
+    if (this.initSelected) {
+      this.entrySelectedId.next(this.initSelected);
+    }
+
+    this.updateList(this.paginationOptions, this.currentSearchScope, this.currentSearchQuery);
+  }
+
+  /**
+   * Method called when an entry is selected.
+   * Emit a new select Event
+   *
+   * @param entry The eperson or group selected
+   */
+  emitSelect(entry: DSpaceObject): void {
+    this.select.emit(entry);
+    this.entrySelectedId.next(entry.id);
+  }
+
+  /**
+   * Return the list of eperson or group
+   */
+  getList(): Observable<RemoteData<PaginatedList<DSpaceObject>>> {
+    return this.list$.asObservable();
+  }
+
+  /**
+   * Return a boolean representing if a table row is selected
+   *
+   * @return {boolean}
+   */
+  isSelected(entry: DSpaceObject): Observable<boolean> {
+    return this.entrySelectedId.asObservable().pipe(
+      map((selectedId) => isNotEmpty(selectedId) && selectedId === entry.id)
+    )
+  }
+
+  /**
+   * Method called on page change
+   */
+  onPageChange(page: number): void {
+    this.paginationOptions.currentPage = page;
+    this.updateList(this.paginationOptions, this.currentSearchScope, this.currentSearchQuery);
+  }
+
+  /**
+   * Method called on search
+   */
+  onSearch(searchEvent: SearchEvent) {
+    this.currentSearchQuery = searchEvent.query;
+    this.currentSearchScope = searchEvent.scope;
+    this.paginationOptions.currentPage = 1;
+    this.updateList(this.paginationOptions, this.currentSearchScope, this.currentSearchQuery);
+  }
+
+  /**
+   * Retrieve a paginate list of eperson or group
+   */
+  updateList(config: PaginationComponentOptions, scope: string, query: string): void {
+    const options: FindListOptions = Object.assign({}, new FindListOptions(), {
+      elementsPerPage: config.pageSize,
+      currentPage: config.currentPage
+    });
+
+    const search$: Observable<RemoteData<PaginatedList<DSpaceObject>>> = this.isListOfEPerson ?
+      (this.dataService as EPersonDataService).searchByScope(scope, query, options) :
+      (this.dataService as GroupDataService).searchGroups(query, options);
+
+    this.subs.push(search$.pipe(getFirstCompletedRemoteData())
+      .subscribe((list: RemoteData<PaginatedList<DSpaceObject>>) => {
+        this.list$.next(list)
+      })
+    );
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.list$ = null;
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe())
+  }
+
+}
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html b/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html
new file mode 100644
index 00000000000..0d130c723c0
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html
@@ -0,0 +1,26 @@
+<form class="d-flex justify-content-between"
+      [formGroup]="searchForm"
+      (ngSubmit)="submit(searchForm.value); $event.stopImmediatePropagation();" >
+  <div>
+    <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+      <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
+      <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
+    </select>
+  </div>
+  <div class="flex-grow-1 mr-3 ml-3">
+    <div class="form-group input-group">
+      <input type="text" name="query" id="query" formControlName="query"
+             class="form-control" aria-label="Search input">
+      <span class="input-group-append">
+        <button type="submit" class="search-button btn btn-secondary">
+          {{ labelPrefix + 'search.button' | translate }}
+        </button>
+      </span>
+    </div>
+  </div>
+  <div>
+    <button type="button" class="search-button btn btn-secondary" (click)="submit(null); reset()">
+      {{ labelPrefix + 'button.see-all' | translate }}
+    </button>
+  </div>
+</form>
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts b/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
new file mode 100644
index 00000000000..8f04948f269
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
@@ -0,0 +1,115 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { TranslateModule } from '@ngx-translate/core';
+
+import { createTestComponent } from '../../../../testing/utils.test';
+import { EpersonSearchBoxComponent } from './eperson-search-box.component';
+import { SearchEvent } from '../eperson-group-list.component';
+
+describe('EpersonSearchBoxComponent test suite', () => {
+  let comp: EpersonSearchBoxComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<EpersonSearchBoxComponent>;
+  let de;
+  let formBuilder: FormBuilder;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        EpersonSearchBoxComponent,
+        TestComponent
+      ],
+      providers: [
+        FormBuilder,
+        EpersonSearchBoxComponent
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-group-search-box></ds-group-search-box>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create EpersonSearchBoxComponent', inject([EpersonSearchBoxComponent], (app: EpersonSearchBoxComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(EpersonSearchBoxComponent);
+      formBuilder = TestBed.get(FormBuilder);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should reset the form', () => {
+      comp.searchForm = formBuilder.group(({
+        query: 'test',
+      }));
+
+      comp.reset();
+
+      expect(comp.searchForm.controls.query.value).toBe('');
+    });
+
+    it('should emit new search event', () => {
+      const data = {
+        scope: 'metadata',
+        query: 'test'
+      }
+
+      const event: SearchEvent = {
+        scope: 'metadata',
+        query: 'test'
+      }
+      spyOn(comp.search, 'emit');
+
+      comp.submit(data);
+
+      expect(comp.search.emit).toHaveBeenCalledWith(event);
+    });
+  })
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts b/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
new file mode 100644
index 00000000000..04c5cafd3f8
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
@@ -0,0 +1,65 @@
+import { Component, EventEmitter, Output } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+
+import { Subscription } from 'rxjs';
+
+import { SearchEvent } from '../eperson-group-list.component';
+import { isNotNull } from '../../../../empty.util';
+
+/**
+ * A component used to show a search box for epersons.
+ */
+@Component({
+  selector: 'ds-eperson-search-box',
+  templateUrl: './eperson-search-box.component.html',
+})
+export class EpersonSearchBoxComponent {
+
+  labelPrefix = 'admin.access-control.epeople.';
+
+  /**
+   * The search form
+   */
+  searchForm;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
+  /**
+   * An event fired when a search is triggred.
+   * Event's payload is a SearchEvent.
+   */
+  @Output() search: EventEmitter<SearchEvent> = new EventEmitter<SearchEvent>();
+
+  constructor(private formBuilder: FormBuilder) {
+    this.searchForm = this.formBuilder.group(({
+      scope: 'metadata',
+      query: '',
+    }));
+  }
+
+  /**
+   * Reset the search form
+   */
+  reset() {
+    this.searchForm = this.formBuilder.group(({
+      scope: 'metadata',
+      query: '',
+    }));
+  }
+
+  /**
+   * Emit a new search event
+   * @param data  Form data
+   */
+  submit(data: any) {
+    const event: SearchEvent = {
+      scope: isNotNull(data) ? data.scope : 'metadata',
+      query: isNotNull(data) ? data.query : ''
+    }
+
+    this.search.emit(event)
+  }
+}
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.html b/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.html
new file mode 100644
index 00000000000..418996c5647
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.html
@@ -0,0 +1,20 @@
+<form class="d-flex justify-content-between"
+      [formGroup]="searchForm"
+      (ngSubmit)="submit(searchForm.value); $event.stopImmediatePropagation();" >
+  <div class="flex-grow-1 mr-3">
+    <div class="form-group input-group">
+      <input type="text" name="query" id="query" formControlName="query"
+             class="form-control" aria-label="Search input">
+      <span class="input-group-append">
+        <button type="submit" class="search-button btn btn-secondary">
+          {{ labelPrefix + 'search.button' | translate }}
+        </button>
+      </span>
+    </div>
+  </div>
+  <div>
+    <button type="button" class="search-button btn btn-secondary" (click)="submit(null); reset()">
+      {{ labelPrefix + 'button.see-all' | translate }}
+    </button>
+  </div>
+</form>
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts b/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts
new file mode 100644
index 00000000000..bcc71a63de1
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts
@@ -0,0 +1,114 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { TranslateModule } from '@ngx-translate/core';
+
+import { createTestComponent } from '../../../../testing/utils.test';
+import { GroupSearchBoxComponent } from './group-search-box.component';
+import { SearchEvent } from '../eperson-group-list.component';
+
+describe('GroupSearchBoxComponent test suite', () => {
+  let comp: GroupSearchBoxComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<GroupSearchBoxComponent>;
+  let de;
+  let formBuilder: FormBuilder;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        GroupSearchBoxComponent,
+        TestComponent
+      ],
+      providers: [
+        FormBuilder,
+        GroupSearchBoxComponent
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-group-search-box></ds-group-search-box>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create GroupSearchBoxComponent', inject([GroupSearchBoxComponent], (app: GroupSearchBoxComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(GroupSearchBoxComponent);
+      formBuilder = TestBed.get(FormBuilder);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should reset the form', () => {
+      comp.searchForm = formBuilder.group(({
+        query: 'test',
+      }));
+
+      comp.reset();
+
+      expect(comp.searchForm.controls.query.value).toBe('');
+    });
+
+    it('should emit new search event', () => {
+      const data = {
+        query: 'test'
+      }
+
+      const event: SearchEvent = {
+        scope: '',
+        query: 'test'
+      }
+      spyOn(comp.search, 'emit');
+
+      comp.submit(data);
+
+      expect(comp.search.emit).toHaveBeenCalledWith(event);
+    });
+  })
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts b/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts
new file mode 100644
index 00000000000..5f4feb582f5
--- /dev/null
+++ b/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts
@@ -0,0 +1,61 @@
+import { Component, EventEmitter, Output } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+
+import { Subscription } from 'rxjs';
+
+import { SearchEvent } from '../eperson-group-list.component';
+
+/**
+ * A component used to show a search box for groups.
+ */
+@Component({
+  selector: 'ds-group-search-box',
+  templateUrl: './group-search-box.component.html',
+})
+export class GroupSearchBoxComponent {
+
+  labelPrefix = 'admin.access-control.groups.';
+
+  /**
+   * The search form
+   */
+  searchForm;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
+  /**
+   * An event fired when a search is triggred.
+   * Event's payload is a SearchEvent.
+   */
+  @Output() search: EventEmitter<SearchEvent> = new EventEmitter<SearchEvent>();
+
+  constructor(private formBuilder: FormBuilder) {
+    this.searchForm = this.formBuilder.group(({
+      query: '',
+    }));
+  }
+
+  /**
+   * Reset the search form
+   */
+  reset() {
+    this.searchForm = this.formBuilder.group(({
+      query: '',
+    }));
+  }
+
+  /**
+   * Emit a new search event
+   * @param data  Form data
+   */
+  submit(data: any) {
+    const event: SearchEvent = {
+      scope: '',
+      query: data.query
+    }
+    this.search.emit(event)
+  }
+}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
new file mode 100644
index 00000000000..65857551450
--- /dev/null
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -0,0 +1,47 @@
+<div>
+  <ds-form *ngIf="formModel"
+           #formRef="formComponent"
+           [formId]="formId"
+           [formModel]="formModel"
+           [displaySubmit]="false"></ds-form>
+  <div class="container-fluid">
+    <label for="ResourcePolicyObject">{{'resource-policies.form.eperson-group-list.label' | translate}}</label>
+    <input id="ResourcePolicyObject" class="form-control mb-3" type="text" readonly [value]="getResourcePolicyTargetName()">
+    <ngb-tabset *ngIf="canSetGrant()" type="pills">
+      <ngb-tab [title]="'resource-policies.form.eperson-group-list.tab.eperson' | translate">
+        <ng-template ngbTabContent>
+          <ds-eperson-group-list (select)="updateObjectSelected($event, true)"></ds-eperson-group-list>
+        </ng-template>
+      </ngb-tab>
+      <ngb-tab [title]="'resource-policies.form.eperson-group-list.tab.group' | translate">
+        <ng-template ngbTabContent>
+          <ds-eperson-group-list [isListOfEPerson]="false"
+                                 (select)="updateObjectSelected($event, false)"></ds-eperson-group-list>
+        </ng-template>
+      </ngb-tab>
+    </ngb-tabset>
+    <div>
+      <hr>
+      <div class="form-group row">
+
+        <div class="col text-right">
+          <button type="reset"
+                  class="btn btn-default"
+                  [disabled]="(isProcessing | async)"
+                  (click)="onReset()">{{'form.cancel' | translate}}</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  [disabled]="!(isFormValid() | async) || (isProcessing | async)"
+                  (click)="onSubmit()">
+            <span *ngIf="(isProcessing | async)">
+                  <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+                </span>
+            <span *ngIf="!(isProcessing | async)">
+                  {{'form.submit' | translate}}
+                </span>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
new file mode 100644
index 00000000000..03978212d7e
--- /dev/null
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -0,0 +1,427 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { BrowserModule, By } from '@angular/platform-browser';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { delay } from 'rxjs/operators';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { createTestComponent } from '../../testing/utils.test';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { GroupMock } from '../../testing/group-mock';
+import { ResourcePolicyEvent, ResourcePolicyFormComponent } from './resource-policy-form.component';
+import { FormService } from '../../form/form.service';
+import { getMockFormService } from '../../mocks/form-service.mock';
+import { FormBuilderService } from '../../form/builder/form-builder.service';
+import { EpersonGroupListComponent } from './eperson-group-list/eperson-group-list.component';
+import { FormComponent } from '../../form/form.component';
+import { stringToNgbDateStruct } from '../../date.util';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+import { EPersonMock } from '../../testing/eperson.mock';
+
+export const mockResourcePolicyFormData = {
+  name: [
+    {
+      value: 'name',
+      language: null,
+      authority: null,
+      display: 'name',
+      confidence: -1,
+      place: 0,
+      otherInformation: null
+    }
+  ],
+  description: [
+    {
+      value: 'description',
+      language: null,
+      authority: null,
+      display: 'description',
+      confidence: -1,
+      place: 0,
+      otherInformation: null
+    }
+  ],
+  policyType: [
+    {
+      value: 'TYPE_WORKFLOW',
+      language: null,
+      authority: null,
+      display: 'TYPE_WORKFLOW',
+      confidence: -1,
+      place: 0,
+      otherInformation: null
+    }
+  ],
+  action: [
+    {
+      value: 'WRITE',
+      language: null,
+      authority: null,
+      display: 'WRITE',
+      confidence: -1,
+      place: 0,
+      otherInformation: null
+    }
+  ],
+  date: {
+    start: [
+      {
+        value: { year: '2019', month: '04', day: '14' },
+        language: null,
+        authority: null,
+        display: '2019-04-14',
+        confidence: -1,
+        place: 0,
+        otherInformation: null
+      }
+    ],
+    end: [
+      {
+        value: { year: '2020', month: '04', day: '14' },
+        language: null,
+        authority: null,
+        display: '2020-04-14',
+        confidence: -1,
+        place: 0,
+        otherInformation: null
+      }
+    ],
+  }
+};
+
+export const submittedResourcePolicy = Object.assign(new ResourcePolicy(), {
+  name: 'name',
+  description: 'description',
+  policyType: PolicyType.TYPE_WORKFLOW,
+  action: ActionType.WRITE,
+  startDate: '2019-04-14T00:00:00Z',
+  endDate: '2020-04-14T00:00:00Z',
+  type: RESOURCE_POLICY
+});
+
+describe('ResourcePolicyFormComponent test suite', () => {
+  let comp: ResourcePolicyFormComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<ResourcePolicyFormComponent>;
+  let de;
+  let scheduler: TestScheduler;
+
+  const resourcePolicy: any = {
+    id: '1',
+    name: null,
+    description: null,
+    policyType: PolicyType.TYPE_SUBMISSION,
+    action: ActionType.READ,
+    startDate: '2019-04-14',
+    endDate: '2020-04-14',
+    type: 'resourcepolicy',
+    uuid: 'resource-policy-1',
+    _links: {
+      eperson: {
+        href: 'https://rest.api/rest/api/eperson'
+      },
+      group: {
+        href: 'https://rest.api/rest/api/group'
+      },
+      self: {
+        href: 'https://rest.api/rest/api/resourcepolicies/1'
+      },
+    },
+    eperson: observableOf(createSuccessfulRemoteDataObject({})),
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+  };
+
+  const epersonService = jasmine.createSpyObj('epersonService', {
+    findByHref: jasmine.createSpy('findByHref'),
+    findAll: jasmine.createSpy('findAll')
+  });
+
+  const groupService = jasmine.createSpyObj('groupService', {
+    findByHref: jasmine.createSpy('findByHref'),
+    findAll: jasmine.createSpy('findAll')
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserModule,
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        FormComponent,
+        EpersonGroupListComponent,
+        ResourcePolicyFormComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: EPersonDataService, useValue: epersonService },
+        { provide: FormService, useValue: getMockFormService() },
+        { provide: GroupDataService, useValue: groupService },
+        { provide: RequestService, useValue: getMockRequestService() },
+        FormBuilderService,
+        ChangeDetectorRef,
+        ResourcePolicyFormComponent
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-resource-policy-form [resourcePolicy]="resourcePolicy" [isProcessing]="isProcessing"></ds-resource-policy-form>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create ResourcePolicyFormComponent', inject([ResourcePolicyFormComponent], (app: ResourcePolicyFormComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('when resource policy is not provided', () => {
+
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(ResourcePolicyFormComponent);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+      comp.isProcessing = observableOf(false);
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should init form model properly', () => {
+      spyOn(compAsAny, 'isFormValid').and.returnValue(observableOf(false));
+      spyOn(compAsAny, 'initModelsValue').and.callThrough();
+      spyOn(compAsAny, 'buildResourcePolicyForm').and.callThrough();
+      fixture.detectChanges();
+
+      expect(compAsAny.buildResourcePolicyForm).toHaveBeenCalled();
+      expect(compAsAny.initModelsValue).toHaveBeenCalled();
+      expect(compAsAny.formModel.length).toBe(5);
+      expect(compAsAny.subs.length).toBe(0);
+
+    });
+
+    it('should can set grant', () => {
+      expect(comp.canSetGrant()).toBeTruthy();
+    });
+
+    it('should not have a target name', () => {
+      expect(comp.getResourcePolicyTargetName()).toBe('');
+    });
+
+    it('should emit reset event', () => {
+      spyOn(compAsAny.reset, 'emit');
+      comp.onReset();
+      expect(compAsAny.reset.emit).toHaveBeenCalled();
+    });
+
+    it('should  update resource policy grant object properly', () => {
+      comp.updateObjectSelected(EPersonMock, true);
+
+      expect(comp.resourcePolicyGrant).toEqual(EPersonMock);
+      expect(comp.resourcePolicyGrantType).toBe('eperson');
+
+      comp.updateObjectSelected(GroupMock, false);
+
+      expect(comp.resourcePolicyGrant).toEqual(GroupMock);
+      expect(comp.resourcePolicyGrantType).toBe('group');
+    });
+
+  });
+
+  describe('when resource policy is provided', () => {
+
+    beforeEach(() => {
+      // initTestScheduler();
+      fixture = TestBed.createComponent(ResourcePolicyFormComponent);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+      comp.resourcePolicy = resourcePolicy;
+      comp.isProcessing = observableOf(false);
+      compAsAny.ePersonService.findByHref.and.returnValue(
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+      );
+      compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should init form model properly', () => {
+      spyOn(compAsAny, 'isFormValid').and.returnValue(observableOf(false));
+      spyOn(compAsAny, 'initModelsValue').and.callThrough();
+      spyOn(compAsAny, 'buildResourcePolicyForm').and.callThrough();
+      fixture.detectChanges();
+
+      expect(compAsAny.buildResourcePolicyForm).toHaveBeenCalled();
+      expect(compAsAny.initModelsValue).toHaveBeenCalled();
+      expect(compAsAny.formModel.length).toBe(5);
+      expect(compAsAny.subs.length).toBe(1);
+      expect(compAsAny.formModel[2].value).toBe('TYPE_SUBMISSION');
+      expect(compAsAny.formModel[3].value).toBe('READ');
+      expect(compAsAny.formModel[4].get(0).value).toEqual(stringToNgbDateStruct('2019-04-14'));
+      expect(compAsAny.formModel[4].get(1).value).toEqual(stringToNgbDateStruct('2020-04-14'));
+
+    });
+
+    it('should init resourcePolicyGrant properly', () => {
+      compAsAny.isActive = true;
+
+      scheduler = getTestScheduler();
+      scheduler.schedule(() => comp.ngOnInit());
+      scheduler.flush();
+
+      expect(compAsAny.resourcePolicyGrant).toEqual(GroupMock);
+    });
+
+    it('should not can set grant', () => {
+      expect(comp.canSetGrant()).toBeFalsy();
+    });
+
+    it('should have a target name', () => {
+      compAsAny.resourcePolicyGrant = GroupMock;
+
+      expect(comp.getResourcePolicyTargetName()).toBe('testgroupname');
+    });
+
+  });
+
+  describe('when form is valid', () => {
+    beforeEach(() => {
+
+      fixture = TestBed.createComponent(ResourcePolicyFormComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      comp.resourcePolicy = resourcePolicy;
+      comp.isProcessing = observableOf(false);
+      compAsAny.ePersonService.findByHref.and.returnValue(
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+      );
+      compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
+      compAsAny.formService.isValid.and.returnValue(observableOf(true));
+      compAsAny.isActive = true;
+      comp.resourcePolicyGrant = GroupMock;
+      comp.resourcePolicyGrantType = 'group';
+      fixture.detectChanges();
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should not have submit button disabled when submission is valid', () => {
+
+      const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
+
+      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+    });
+
+    it('should emit submit event', () => {
+      spyOn(compAsAny.submit, 'emit');
+      spyOn(compAsAny, 'createResourcePolicyByFormData').and.callThrough();
+      compAsAny.formService.getFormData.and.returnValue(observableOf(mockResourcePolicyFormData));
+      const eventPayload: ResourcePolicyEvent = Object.create({});
+      eventPayload.object = submittedResourcePolicy;
+      eventPayload.target = {
+        type: 'group',
+        uuid: GroupMock.id
+      };
+
+      scheduler = getTestScheduler();
+      scheduler.schedule(() => comp.onSubmit());
+
+      scheduler.flush();
+
+      expect(compAsAny.submit.emit).toHaveBeenCalledWith(eventPayload);
+      expect(compAsAny.createResourcePolicyByFormData).toHaveBeenCalled();
+    });
+
+  });
+
+  describe('when form is not valid', () => {
+    beforeEach(() => {
+
+      fixture = TestBed.createComponent(ResourcePolicyFormComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      comp.resourcePolicy = resourcePolicy;
+      comp.isProcessing = observableOf(false);
+      compAsAny.ePersonService.findByHref.and.returnValue(
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+      );
+      compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
+      compAsAny.formService.isValid.and.returnValue(observableOf(false));
+      compAsAny.isActive = true;
+      fixture.detectChanges();
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should have submit button disabled when submission is valid', () => {
+
+      const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
+
+      expect(depositBtn.nativeElement.disabled).toBeTruthy();
+    });
+
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+  resourcePolicy = null;
+  isProcessing = observableOf(false);
+}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
new file mode 100644
index 00000000000..c5ff34254fe
--- /dev/null
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -0,0 +1,317 @@
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+
+import { Observable, of as observableOf, race as observableRace } from 'rxjs';
+import { filter, map, take } from 'rxjs/operators';
+import {
+  DynamicDatePickerModel,
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicSelectModel
+} from '@ng-dynamic-forms/core';
+
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { DsDynamicInputModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import {
+  RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG,
+  RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG,
+  RESOURCE_POLICY_FORM_DATE_GROUP_LAYOUT,
+  RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG,
+  RESOURCE_POLICY_FORM_END_DATE_CONFIG,
+  RESOURCE_POLICY_FORM_END_DATE_LAYOUT,
+  RESOURCE_POLICY_FORM_NAME_CONFIG,
+  RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG,
+  RESOURCE_POLICY_FORM_START_DATE_CONFIG,
+  RESOURCE_POLICY_FORM_START_DATE_LAYOUT
+} from './resource-policy-form.model';
+import { DsDynamicTextAreaModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { hasValue, isEmpty, isNotEmpty } from '../../empty.util';
+import { FormService } from '../../form/form.service';
+import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { dateToISOFormat, stringToNgbDateStruct } from '../../date.util';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { RequestService } from '../../../core/data/request.service';
+
+export interface ResourcePolicyEvent {
+  object: ResourcePolicy,
+  target: {
+    type: string,
+    uuid: string
+  }
+}
+
+@Component({
+  selector: 'ds-resource-policy-form',
+  templateUrl: './resource-policy-form.component.html',
+})
+/**
+ * Component that show form for adding/editing a resource policy
+ */
+export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
+
+  /**
+   * If given contains the resource policy to edit
+   * @type {ResourcePolicy}
+   */
+  @Input() resourcePolicy: ResourcePolicy;
+
+  /**
+   * A boolean representing if form submit operation is processing
+   * @type {boolean}
+   */
+  @Input() isProcessing: Observable<boolean> = observableOf(false);
+
+  /**
+   * An event fired when form is canceled.
+   * Event's payload is empty.
+   */
+  @Output() reset: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * An event fired when form is submitted.
+   * Event's payload equals to a new ResourcePolicy.
+   */
+  @Output() submit: EventEmitter<ResourcePolicyEvent> = new EventEmitter<ResourcePolicyEvent>();
+
+  /**
+   * The form id
+   * @type {string}
+   */
+  public formId: string;
+
+  /**
+   * The form model
+   * @type {DynamicFormControlModel[]}
+   */
+  public formModel: DynamicFormControlModel[];
+
+  /**
+   * The eperson or group that will be grant of the permission
+   * @type {DSpaceObject}
+   */
+  public resourcePolicyGrant: DSpaceObject;
+
+  /**
+   * The type of the object that will be grant of the permission. It could be 'eperson' or 'group'
+   * @type {string}
+   */
+  public resourcePolicyGrantType: string;
+
+  /**
+   * A boolean representing if component is active
+   * @type {boolean}
+   */
+  private isActive: boolean;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {DSONameService} dsoNameService
+   * @param {EPersonDataService} ePersonService
+   * @param {FormService} formService
+   * @param {GroupDataService} groupService
+   * @param {RequestService} requestService
+   */
+  constructor(
+    private dsoNameService: DSONameService,
+    private ePersonService: EPersonDataService,
+    private formService: FormService,
+    private groupService: GroupDataService,
+    private requestService: RequestService,
+  ) {
+  }
+
+  /**
+   * Initialize the component, setting up the form model
+   */
+  ngOnInit(): void {
+    this.isActive = true;
+    this.formId = this.formService.getUniqueId('resource-policy-form');
+    this.formModel = this.buildResourcePolicyForm();
+
+    if (!this.canSetGrant()) {
+      this.requestService.removeByHrefSubstring(this.resourcePolicy._links.eperson.href);
+      this.requestService.removeByHrefSubstring(this.resourcePolicy._links.group.href);
+      const epersonRD$ = this.ePersonService.findByHref(this.resourcePolicy._links.eperson.href).pipe(
+        getFirstSucceededRemoteData()
+      );
+      const groupRD$ = this.groupService.findByHref(this.resourcePolicy._links.group.href).pipe(
+        getFirstSucceededRemoteData()
+      );
+      const dsoRD$: Observable<RemoteData<DSpaceObject>> = observableRace(epersonRD$, groupRD$);
+      this.subs.push(
+        dsoRD$.pipe(
+          filter(() => this.isActive),
+        ).subscribe((dsoRD: RemoteData<DSpaceObject>) => {
+          this.resourcePolicyGrant = dsoRD.payload;
+        })
+      )
+    }
+  }
+
+  /**
+   * Method to check if the form status is valid or not
+   *
+   * @return Observable that emits the form status
+   */
+  isFormValid(): Observable<boolean> {
+    return this.formService.isValid(this.formId).pipe(
+      map((isValid: boolean) => isValid && isNotEmpty(this.resourcePolicyGrant))
+    )
+  }
+
+  /**
+   * Initialize the form model
+   *
+   * @return the form models
+   */
+  private buildResourcePolicyForm(): DynamicFormControlModel[] {
+    const formModel: DynamicFormControlModel[] = [];
+    // TODO to be removed when https://jira.lyrasis.org/browse/DS-4477 will be implemented
+    const policyTypeConf = Object.assign({}, RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG, {
+      disabled: isNotEmpty(this.resourcePolicy)
+    });
+    // TODO to be removed when https://jira.lyrasis.org/browse/DS-4477 will be implemented
+    const actionConf = Object.assign({}, RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG, {
+      disabled: isNotEmpty(this.resourcePolicy)
+    });
+    formModel.push(
+      new DsDynamicInputModel(RESOURCE_POLICY_FORM_NAME_CONFIG),
+      new DsDynamicTextAreaModel(RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG),
+      new DynamicSelectModel(policyTypeConf),
+      new DynamicSelectModel(actionConf)
+    );
+
+    const startDateModel = new DynamicDatePickerModel(
+      RESOURCE_POLICY_FORM_START_DATE_CONFIG,
+      RESOURCE_POLICY_FORM_START_DATE_LAYOUT
+    );
+    const endDateModel = new DynamicDatePickerModel(
+      RESOURCE_POLICY_FORM_END_DATE_CONFIG,
+      RESOURCE_POLICY_FORM_END_DATE_LAYOUT
+    );
+    const dateGroupConfig = Object.assign({}, RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG, { group: [] });
+    dateGroupConfig.group.push(startDateModel, endDateModel);
+    formModel.push(new DynamicFormGroupModel(dateGroupConfig, RESOURCE_POLICY_FORM_DATE_GROUP_LAYOUT));
+
+    this.initModelsValue(formModel);
+    return formModel
+  }
+
+  /**
+   * Setting up the form models value
+   *
+   * @return the form models
+   */
+  initModelsValue(formModel: DynamicFormControlModel[]): DynamicFormControlModel[] {
+    if (this.resourcePolicy) {
+      formModel.forEach((model: any) => {
+        if (model.id === 'date') {
+          if (hasValue(this.resourcePolicy.startDate)) {
+            model.get(0).valueUpdates.next(stringToNgbDateStruct(this.resourcePolicy.startDate));
+          }
+          if (hasValue(this.resourcePolicy.endDate)) {
+            model.get(1).valueUpdates.next(stringToNgbDateStruct(this.resourcePolicy.endDate));
+          }
+        } else {
+          if (this.resourcePolicy.hasOwnProperty(model.id) && this.resourcePolicy[model.id]) {
+            model.valueUpdates.next(this.resourcePolicy[model.id]);
+          }
+        }
+      })
+    }
+
+    return formModel;
+  }
+
+  /**
+   * Return a boolean representing If is possible to set policy grant
+   *
+   * @return true if is possible, false otherwise
+   */
+  canSetGrant(): boolean {
+    return isEmpty(this.resourcePolicy);
+  }
+
+  /**
+   * Return the name of the eperson or group that will be grant of the permission
+   *
+   * @return the object name
+   */
+  getResourcePolicyTargetName(): string {
+    return isNotEmpty(this.resourcePolicyGrant) ? this.dsoNameService.getName(this.resourcePolicyGrant) : '';
+  }
+
+  /**
+   * Update reference to the eperson or group that will be grant of the permission
+   */
+  updateObjectSelected(object: DSpaceObject, isEPerson: boolean): void {
+    this.resourcePolicyGrant = object;
+    this.resourcePolicyGrantType = isEPerson ? 'eperson' : 'group';
+  }
+
+  /**
+   * Method called on reset
+   * Emit a new reset Event
+   */
+  onReset(): void {
+    this.reset.emit();
+  }
+
+  /**
+   * Method called on submit.
+   * Emit a new submit Event whether the form is valid
+   */
+  onSubmit(): void {
+    this.formService.getFormData(this.formId).pipe(take(1))
+      .subscribe((data) => {
+        const eventPayload: ResourcePolicyEvent = Object.create({});
+        eventPayload.object = this.createResourcePolicyByFormData(data);
+        eventPayload.target = {
+          type: this.resourcePolicyGrantType,
+          uuid: this.resourcePolicyGrant.id
+        };
+        this.submit.emit(eventPayload);
+      })
+  }
+
+  /**
+   * Create e new ResourcePolicy by form data
+   *
+   * @return the new ResourcePolicy object
+   */
+  createResourcePolicyByFormData(data): ResourcePolicy {
+    const resourcePolicy = new ResourcePolicy();
+    resourcePolicy.name = (data.name) ? data.name[0].value : null;
+    resourcePolicy.description = (data.description) ? data.description[0].value : null;
+    resourcePolicy.policyType = (data.policyType) ? data.policyType[0].value : null;
+    resourcePolicy.action = (data.action) ? data.action[0].value : null;
+    resourcePolicy.startDate = (data.date && data.date.start) ? dateToISOFormat(data.date.start[0].value) : null;
+    resourcePolicy.endDate = (data.date && data.date.end) ? dateToISOFormat(data.date.end[0].value) : null;
+    resourcePolicy.type = RESOURCE_POLICY;
+
+    return resourcePolicy;
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.isActive = false;
+    this.formModel = null;
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe())
+  }
+}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.model.ts b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
new file mode 100644
index 00000000000..f522b77b17f
--- /dev/null
+++ b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
@@ -0,0 +1,156 @@
+import {
+  DynamicDatePickerModelConfig,
+  DynamicFormControlLayout,
+  DynamicFormGroupModelConfig,
+  DynamicFormOptionConfig,
+  DynamicSelectModelConfig,
+} from '@ng-dynamic-forms/core';
+
+import { DsDynamicInputModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DsDynamicTextAreaModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+
+const policyTypeList: Array<DynamicFormOptionConfig<any>> = [
+  {
+    label: PolicyType.TYPE_SUBMISSION,
+    value: PolicyType.TYPE_SUBMISSION
+  },
+  {
+    label: PolicyType.TYPE_WORKFLOW,
+    value: PolicyType.TYPE_WORKFLOW
+  },
+  {
+    label: PolicyType.TYPE_INHERITED,
+    value: PolicyType.TYPE_INHERITED
+  },
+  {
+    label: PolicyType.TYPE_CUSTOM,
+    value: PolicyType.TYPE_CUSTOM
+  },
+];
+
+const policyActionList: Array<DynamicFormOptionConfig<any>> = [
+  {
+    label: ActionType.READ.toString(),
+    value: ActionType.READ
+  },
+  {
+    label: ActionType.WRITE.toString(),
+    value: ActionType.WRITE
+  },
+  {
+    label: ActionType.REMOVE.toString(),
+    value: ActionType.REMOVE
+  },
+  {
+    label: ActionType.ADMIN.toString(),
+    value: ActionType.ADMIN
+  },
+  {
+    label: ActionType.DELETE.toString(),
+    value: ActionType.DELETE
+  },
+  {
+    label: ActionType.WITHDRAWN_READ.toString(),
+    value: ActionType.WITHDRAWN_READ
+  },
+  {
+    label: ActionType.DEFAULT_BITSTREAM_READ.toString(),
+    value: ActionType.DEFAULT_BITSTREAM_READ
+  },
+  {
+    label: ActionType.DEFAULT_ITEM_READ.toString(),
+    value: ActionType.DEFAULT_ITEM_READ
+  }
+];
+
+export const RESOURCE_POLICY_FORM_NAME_CONFIG: DsDynamicInputModelConfig = {
+  id: 'name',
+  label: 'resource-policies.form.name.label',
+  metadataFields: [],
+  repeatable: false,
+  submissionId: '',
+  hasSelectableMetadata: false
+};
+
+export const RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG: DsDynamicTextAreaModelConfig = {
+  id: 'description',
+  label: 'resource-policies.form.description.label',
+  metadataFields: [],
+  repeatable: false,
+  rows: 10,
+  submissionId: '',
+  hasSelectableMetadata: false
+};
+
+export const RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
+  id: 'policyType',
+  label: 'resource-policies.form.policy-type.label',
+  options: policyTypeList,
+  required: true,
+  validators: {
+    required: null
+  },
+  errorMessages: {
+    required: 'resource-policies.form.policy-type.required'
+  }
+};
+
+export const RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
+  id: 'action',
+  label: 'resource-policies.form.action-type.label',
+  options: policyActionList,
+  required: true,
+  validators: {
+    required: null
+  },
+  errorMessages: {
+    required: 'resource-policies.form.action-type.required'
+  }
+};
+
+export const RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG: DynamicFormGroupModelConfig = {
+  id: 'date',
+  group: []
+};
+export const RESOURCE_POLICY_FORM_DATE_GROUP_LAYOUT: DynamicFormControlLayout = {
+  element: {
+    control: 'form-row',
+  }
+};
+
+export const RESOURCE_POLICY_FORM_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
+  id: 'start',
+  label: 'resource-policies.form.date.start.label',
+  placeholder: 'resource-policies.form.date.start.label',
+  inline: false,
+  toggleIcon: 'far fa-calendar-alt'
+};
+
+export const RESOURCE_POLICY_FORM_START_DATE_LAYOUT: DynamicFormControlLayout = {
+  element: {
+    container: 'p-0',
+    label: 'col-form-label'
+  },
+  grid: {
+    host: 'col-md-6'
+  }
+};
+
+export const RESOURCE_POLICY_FORM_END_DATE_CONFIG: DynamicDatePickerModelConfig = {
+  id: 'end',
+  label: 'resource-policies.form.date.end.label',
+  placeholder: 'resource-policies.form.date.end.label',
+  inline: false,
+  toggleIcon: 'far fa-calendar-alt'
+};
+export const RESOURCE_POLICY_FORM_END_DATE_LAYOUT: DynamicFormControlLayout = {
+  element: {
+    container: 'p-0',
+    label: 'col-form-label'
+  },
+  grid: {
+    host: 'col-md-6'
+  }
+};
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
new file mode 100644
index 00000000000..743ec69f36b
--- /dev/null
+++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
@@ -0,0 +1,53 @@
+import { Injectable, Injector } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+
+import { Observable } from 'rxjs';
+
+import { getDataServiceFor } from '../../../core/cache/builders/build-decorators';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { DataService } from '../../../core/data/data.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { isEmpty } from '../../empty.util';
+import { RemoteData } from '../../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+/**
+ * This class represents a resolver that requests a specific item before the route is activated
+ */
+@Injectable()
+export class ResourcePolicyTargetResolver implements Resolve<RemoteData<DSpaceObject>> {
+
+  /**
+   * The data service used to make request.
+   */
+  private dataService: DataService<DSpaceObject>;
+
+  constructor(private parentInjector: Injector, private router: Router) {
+  }
+
+  /**
+   * Method for resolving an item based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<DSpaceObject>> {
+    const targetType = route.queryParamMap.get('targetType');
+    const policyTargetId = route.queryParamMap.get('policyTargetId');
+
+    if (isEmpty(targetType) || isEmpty(policyTargetId)) {
+      this.router.navigateByUrl('/404', { skipLocationChange: true });
+    }
+
+    const provider = getDataServiceFor(new ResourceType(targetType));
+    this.dataService = Injector.create({
+      providers: [],
+      parent: this.parentInjector
+    }).get(provider);
+
+    return this.dataService.findById(policyTargetId).pipe(
+      getFirstCompletedRemoteData(),
+    );
+  }
+}
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
new file mode 100644
index 00000000000..5261cc97a7a
--- /dev/null
+++ b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+
+import { Observable } from 'rxjs';
+
+import { isEmpty } from '../../empty.util';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { followLink } from '../../utils/follow-link-config.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+/**
+ * This class represents a resolver that requests a specific item before the route is activated
+ */
+@Injectable()
+export class ResourcePolicyResolver implements Resolve<RemoteData<ResourcePolicy>> {
+
+  constructor(private resourcePolicyService: ResourcePolicyService, private router: Router) {
+  }
+
+  /**
+   * Method for resolving an item based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<ResourcePolicy>> {
+    const policyId = route.queryParamMap.get('policyId');
+
+    if (isEmpty(policyId)) {
+      this.router.navigateByUrl('/404', { skipLocationChange: true });
+    }
+
+    return this.resourcePolicyService.findById(policyId, false, followLink('eperson'), followLink('group')).pipe(
+      getFirstCompletedRemoteData(),
+    );
+  }
+}
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
new file mode 100644
index 00000000000..b06946ad255
--- /dev/null
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -0,0 +1,99 @@
+<div *ngIf="(getResourcePolicies() | async)?.length > 0" class="table-responsive">
+  <table class="table table-striped table-bordered table-hover">
+    <thead>
+      <tr>
+        <th colspan="10">
+          <div class="d-flex justify-content-between align-items-center m-0">
+            {{ 'resource-policies.table.headers.title.for.' + resourceType | translate }} {{resourceUUID}}
+            <div>
+              <button class="btn btn-danger float-right ml-1"
+                      [disabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
+                      [title]="'resource-policies.delete.btn.title' | translate"
+                      (click)="deleteSelectedResourcePolicies()">
+                <span *ngIf="(isProcessingDelete() | async)">
+                  <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+                </span>
+                <span *ngIf="!(isProcessingDelete() | async)">
+                  <i class='fas fa-trash-alt fa-fw'></i>
+                  {{'resource-policies.delete.btn' | translate}}
+                </span>
+              </button>
+              <button class="btn btn-success float-right"
+                      [disabled]="(isProcessingDelete() | async)"
+                      [title]="'resource-policies.add.for.' + resourceType | translate"
+                      (click)="redirectToResourcePolicyCreatePage()">
+                <i class='fas fa-plus'></i>
+                {{'resource-policies.add.button' | translate}}
+              </button>
+            </div>
+          </div>
+        </th>
+      </tr>
+      <tr class="text-center">
+        <th>
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox"
+                   class="custom-control-input"
+                   [id]="'selectAll_' + resourceUUID"
+                   (change)="selectAllCheckbox($event)">
+            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID"></label>
+          </div>
+        </th>
+        <th>{{'resource-policies.table.headers.id' | translate}}</th>
+        <th>{{'resource-policies.table.headers.name' | translate}}</th>
+        <th>{{'resource-policies.table.headers.policyType' | translate}}</th>
+        <th>{{'resource-policies.table.headers.action' | translate}}</th>
+        <th>{{'resource-policies.table.headers.eperson' | translate}}</th>
+        <th>{{'resource-policies.table.headers.group' | translate}}</th>
+        <th>{{'resource-policies.table.headers.date.start' | translate}}</th>
+        <th>{{'resource-policies.table.headers.date.end' | translate}}</th>
+        <th>{{'resource-policies.table.headers.edit' | translate}}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let entry of (getResourcePolicies() | async); trackById">
+        <td class="text-center">
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox"
+                   class="custom-control-input"
+                   [id]="entry.id"
+                   [ngModel]="entry.checked"
+                   (ngModelChange)="selectCheckbox(entry, $event)">
+            <label class="custom-control-label" [for]="entry.id"></label>
+          </div>
+        </td>
+        <th scope="row">
+          {{entry.id}}
+        </th>
+        <td>{{entry.policy.name}}</td>
+        <td>{{entry.policy.policyType}}</td>
+        <td>{{entry.policy.action}}</td>
+        <td *ngIf="(hasEPerson(entry.policy) | async)">
+          {{getEPersonName(entry.policy) | async}}
+        </td>
+        <td *ngIf="!(hasEPerson(entry.policy) | async)"></td>
+        <td *ngIf="(hasGroup(entry.policy) | async)">
+          {{getGroupName(entry.policy) | async}}
+        </td>
+        <td *ngIf="!(hasGroup(entry.policy) | async)"></td>
+        <td>{{formatDate(entry.policy.startDate)}}</td>
+        <td>{{formatDate(entry.policy.endDate)}}</td>
+        <td class="text-center">
+
+          <div class="btn-group edit-field">
+            <button class="btn btn-outline-primary btn-sm"
+                    [title]="'resource-policies.table.headers.edit.policy' | translate"
+                    (click)="redirectToResourcePolicyEditPage(entry.policy)">
+              <i class="fas fa-edit fa-fw"></i>
+            </button>
+            <button *ngIf="(hasGroup(entry.policy) | async)" class="btn btn-outline-primary btn-sm"
+                    [title]="'resource-policies.table.headers.edit.group' | translate"
+                    (click)="redirectToGroupEditPage(entry.policy)">
+              <i class="fas fa-users fa-fw"></i>
+            </button>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/src/app/shared/resource-policies/resource-policies.component.scss b/src/app/shared/resource-policies/resource-policies.component.scss
new file mode 100644
index 00000000000..0d9329e760d
--- /dev/null
+++ b/src/app/shared/resource-policies/resource-policies.component.scss
@@ -0,0 +1,3 @@
+td .btn-link:focus {
+  box-shadow: none !important;
+}
diff --git a/src/app/shared/resource-policies/resource-policies.component.spec.ts b/src/app/shared/resource-policies/resource-policies.component.spec.ts
new file mode 100644
index 00000000000..41ad1dafe47
--- /dev/null
+++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts
@@ -0,0 +1,487 @@
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { Bundle } from '../../core/shared/bundle.model';
+import { Item } from '../../core/shared/item.model';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { getMockLinkService } from '../mocks/link-service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../remote-data.utils';
+import { createPaginatedList, createTestComponent } from '../testing/utils.test';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { NotificationsService } from '../notifications/notifications.service';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { RouterStub } from '../testing/router.stub';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ResourcePoliciesComponent } from './resource-policies.component';
+import { PolicyType } from '../../core/resource-policy/models/policy-type.model';
+import { ActionType } from '../../core/resource-policy/models/action-type.model';
+import { EPersonMock } from '../testing/eperson.mock';
+import { GroupMock } from '../testing/group-mock';
+
+describe('ResourcePoliciesComponent test suite', () => {
+  let comp: ResourcePoliciesComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<ResourcePoliciesComponent>;
+  let de;
+  let routerStub: any;
+  let scheduler: TestScheduler;
+  const notificationsServiceStub = new NotificationsServiceStub();
+  const resourcePolicyService: any = getMockResourcePolicyService();
+  const linkService: any = getMockLinkService();
+
+  const resourcePolicy: any = {
+    id: '1',
+    name: null,
+    description: null,
+    policyType: PolicyType.TYPE_SUBMISSION,
+    action: ActionType.READ,
+    startDate: null,
+    endDate: null,
+    type: 'resourcepolicy',
+    uuid: 'resource-policy-1',
+    _links: {
+      eperson: {
+        href: 'https://rest.api/rest/api/eperson'
+      },
+      group: {
+        href: 'https://rest.api/rest/api/group'
+      },
+      self: {
+        href: 'https://rest.api/rest/api/resourcepolicies/1'
+      },
+    },
+    eperson: observableOf(createSuccessfulRemoteDataObject({})),
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+  };
+
+  const anotherResourcePolicy: any = {
+    id: '2',
+    name: null,
+    description: null,
+    policyType: PolicyType.TYPE_SUBMISSION,
+    action: ActionType.WRITE,
+    startDate: null,
+    endDate: null,
+    type: 'resourcepolicy',
+    uuid: 'resource-policy-2',
+    _links: {
+      eperson: {
+        href: 'https://rest.api/rest/api/eperson'
+      },
+      group: {
+        href: 'https://rest.api/rest/api/group'
+      },
+      self: {
+        href: 'https://rest.api/rest/api/resourcepolicies/1'
+      },
+    },
+    eperson: observableOf(createSuccessfulRemoteDataObject(EPersonMock)),
+    group: observableOf(createSuccessfulRemoteDataObject({}))
+  };
+
+  const bitstream1 = Object.assign(new Bitstream(), {
+    id: 'bitstream1',
+    uuid: 'bitstream1'
+  });
+  const bitstream2 = Object.assign(new Bitstream(), {
+    id: 'bitstream2',
+    uuid: 'bitstream2'
+  });
+  const bitstream3 = Object.assign(new Bitstream(), {
+    id: 'bitstream3',
+    uuid: 'bitstream3'
+  });
+  const bitstream4 = Object.assign(new Bitstream(), {
+    id: 'bitstream4',
+    uuid: 'bitstream4'
+  });
+  const bundle1 = Object.assign(new Bundle(), {
+    id: 'bundle1',
+    uuid: 'bundle1',
+    _links: {
+      self: { href: 'bundle1-selflink' }
+    },
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+  });
+  const bundle2 = Object.assign(new Bundle(), {
+    id: 'bundle2',
+    uuid: 'bundle2',
+    _links: {
+      self: { href: 'bundle2-selflink' }
+    },
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4]))
+  });
+
+  const item = Object.assign(new Item(), {
+    uuid: 'itemUUID',
+    id: 'itemUUID',
+    _links: {
+      self: { href: 'item-selflink' }
+    },
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2]))
+  });
+
+  const routeStub = {
+    data: observableOf({
+      item: createSuccessfulRemoteDataObject(item)
+    })
+  };
+
+  const epersonService = jasmine.createSpyObj('epersonService', {
+    findByHref: jasmine.createSpy('findByHref'),
+  });
+
+  const groupService = jasmine.createSpyObj('groupService', {
+    findByHref: jasmine.createSpy('findByHref'),
+  });
+
+  routerStub = Object.assign(new RouterStub(), {
+    url: `url/edit`
+  });
+
+  const getInitEntries = () => {
+    return [
+      Object.assign({}, {
+        id: resourcePolicy.id,
+        policy: resourcePolicy,
+        checked: false
+      }),
+      Object.assign({}, {
+        id: anotherResourcePolicy.id,
+        policy: anotherResourcePolicy,
+        checked: false
+      })
+    ]
+  }
+
+  const resourcePolicySelectedEntries = [
+    {
+      id: resourcePolicy.id,
+      policy: resourcePolicy,
+      checked: true
+    },
+    {
+      id: anotherResourcePolicy.id,
+      policy: anotherResourcePolicy,
+      checked: false
+    }
+  ];
+
+  const pageInfo = new PageInfo();
+  const array = [resourcePolicy, anotherResourcePolicy];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        ResourcePoliciesComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: LinkService, useValue: linkService },
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: EPersonDataService, useValue: epersonService },
+        { provide: GroupDataService, useValue: groupService },
+        { provide: NotificationsService, useValue: notificationsServiceStub },
+        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: RequestService, useValue: getMockRequestService() },
+        { provide: Router, useValue: routerStub },
+        ChangeDetectorRef,
+        ResourcePoliciesComponent
+      ], schemas: [
+        NO_ERRORS_SCHEMA
+      ]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-resource-policies [resourceUUID]="resourceUUID" [resourceType]="resourceType"></ds-resource-policies>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create ResourcePoliciesComponent', inject([ResourcePoliciesComponent], (app: ResourcePoliciesComponent) => {
+
+      expect(app).toBeDefined();
+
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ResourcePoliciesComponent);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+      linkService.resolveLink.and.callFake((object, link) => object);
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    it('should init component properly', () => {
+      spyOn(comp, 'initResourcePolicyLIst');
+      fixture.detectChanges();
+      expect(compAsAny.isActive).toBeTruthy();
+      expect(comp.initResourcePolicyLIst).toHaveBeenCalled();
+    });
+
+    it('should init resource policies list properly', () => {
+      const expected = getInitEntries();
+      compAsAny.isActive = true;
+      resourcePolicyService.searchByResource.and.returnValue(hot('a|', {
+        a: paginatedListRD
+      }));
+
+      scheduler = getTestScheduler();
+      scheduler.schedule(() => comp.initResourcePolicyLIst());
+      scheduler.flush();
+
+      expect(compAsAny.resourcePoliciesEntries$.value).toEqual(expected);
+    });
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ResourcePoliciesComponent);
+      comp = fixture.componentInstance;
+      compAsAny = fixture.componentInstance;
+      linkService.resolveLink.and.callFake((object, link) => object);
+      compAsAny.isActive = true;
+      const initResourcePolicyEntries = getInitEntries();
+      compAsAny.resourcePoliciesEntries$.next(initResourcePolicyEntries);
+      resourcePolicyService.searchByResource.and.returnValue(observableOf({}));
+      spyOn(comp, 'initResourcePolicyLIst').and.callFake(() => ({}));
+      fixture.detectChanges();
+    });
+
+    afterEach(() => {
+      comp = null;
+      compAsAny = null;
+      de = null;
+      fixture.destroy();
+    });
+
+    describe('canDelete', () => {
+      beforeEach(() => {
+        const initResourcePolicyEntries = getInitEntries();
+        compAsAny.resourcePoliciesEntries$.next(initResourcePolicyEntries);
+        fixture.detectChanges();
+      });
+
+      afterEach(() => {
+        comp = null;
+        compAsAny = null;
+        de = null;
+        fixture.destroy();
+      });
+
+      it('should return false when no row is selected', () => {
+        expect(comp.canDelete()).toBeObservable(cold('(a|)', {
+          a: false
+        }));
+      });
+
+      it('should return true when al least is selected', () => {
+        const checkbox = fixture.debugElement.query(By.css('table > tbody > tr:nth-child(1) input'));
+        const event = { target: { checked: true } };
+        checkbox.triggerEventHandler('change', event);
+        expect(comp.canDelete()).toBeObservable(cold('(a|)', {
+          a: true
+        }));
+      });
+    });
+
+    it('should render a table with a row for each policy', () => {
+      const rows = fixture.debugElement.queryAll(By.css('table > tbody > tr'));
+      expect(rows.length).toBe(2);
+    });
+
+    describe('deleteSelectedResourcePolicies', () => {
+      beforeEach(() => {
+        compAsAny.resourcePoliciesEntries$.next(resourcePolicySelectedEntries);
+        fixture.detectChanges();
+      });
+
+      it('should notify success when delete is successful', () => {
+
+        resourcePolicyService.delete.and.returnValue(observableOf(true));
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.deleteSelectedResourcePolicies());
+        scheduler.flush();
+
+        expect(notificationsServiceStub.success).toHaveBeenCalled();
+        expect(comp.initResourcePolicyLIst).toHaveBeenCalled();
+      });
+
+      it('should notify error when delete is not successful', () => {
+
+        resourcePolicyService.delete.and.returnValue(observableOf(false));
+        scheduler = getTestScheduler();
+        scheduler.schedule(() => comp.deleteSelectedResourcePolicies());
+        scheduler.flush();
+
+        expect(notificationsServiceStub.error).toHaveBeenCalled();
+        expect(comp.initResourcePolicyLIst).toHaveBeenCalled();
+      });
+    });
+
+    it('should get the resource\'s policy list', () => {
+      const initResourcePolicyEntries = getInitEntries();
+      expect(comp.getResourcePolicies()).toBeObservable(cold('a', {
+        a: initResourcePolicyEntries
+      }));
+
+    });
+
+    describe('hasEPerson', () => {
+      it('should true when policy is link to the eperson', () => {
+
+        expect(comp.hasEPerson(anotherResourcePolicy)).toBeObservable(cold('(ab|)', {
+          a: false,
+          b: true
+        }));
+
+      });
+
+      it('should false when policy is not link to the eperson', () => {
+
+        expect(comp.hasEPerson(resourcePolicy)).toBeObservable(cold('(aa|)', {
+          a: false
+        }));
+
+      });
+    });
+
+    describe('hasGroup', () => {
+      it('should true when policy is link to the group', () => {
+
+        expect(comp.hasGroup(resourcePolicy)).toBeObservable(cold('(ab|)', {
+          a: false,
+          b: true
+        }));
+
+      });
+
+      it('should false when policy is not link to the group', () => {
+
+        expect(comp.hasGroup(anotherResourcePolicy)).toBeObservable(cold('(aa|)', {
+          a: false
+        }));
+
+      });
+    });
+
+    describe('getEPersonName', () => {
+      it('should return the eperson name', () => {
+
+        expect(comp.getEPersonName(anotherResourcePolicy)).toBeObservable(cold('(ab|)', {
+          a: '',
+          b: 'User Test'
+        }));
+      });
+    });
+
+    describe('getGroupName', () => {
+      it('should return the group name', () => {
+
+        expect(comp.getGroupName(resourcePolicy)).toBeObservable(cold('(ab|)', {
+          a: '',
+          b: 'testgroupname'
+        }));
+      });
+    });
+
+    it('should format date properly', () => {
+      expect(comp.formatDate('2020-04-14T12:00:00Z')).toBe('2020-04-14');
+    });
+
+    it('should select All Checkbox', () => {
+      spyOn(comp, 'selectAllCheckbox').and.callThrough();
+      const checkbox = fixture.debugElement.query(By.css('table > thead > tr:nth-child(2) input'));
+
+      const event = { target: { checked: true } };
+      checkbox.triggerEventHandler('change', event);
+      expect(comp.selectAllCheckbox).toHaveBeenCalled();
+    });
+
+    it('should select a Checkbox', () => {
+      spyOn(comp, 'selectCheckbox').and.callThrough();
+      const checkbox = fixture.debugElement.query(By.css('table > tbody > tr:nth-child(1) input'));
+
+      const event = { target: { checked: true } };
+      checkbox.triggerEventHandler('change', event);
+      expect(comp.selectCheckbox).toHaveBeenCalled();
+    });
+
+    it('should redirect to create resource policy page', () => {
+
+      comp.redirectToResourcePolicyCreatePage();
+      expect(compAsAny.router.navigate).toHaveBeenCalled();
+    });
+
+    it('should redirect to resource policy edit page', () => {
+
+      comp.redirectToResourcePolicyEditPage(resourcePolicy);
+      expect(compAsAny.router.navigate).toHaveBeenCalled();
+    });
+
+    it('should redirect to resource policy edit page', () => {
+      compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
+
+      comp.redirectToGroupEditPage(resourcePolicy);
+      expect(compAsAny.router.navigate).toHaveBeenCalled();
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+  resourceUUID = 'itemUUID';
+  resourceType = 'item';
+}
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
new file mode 100644
index 00000000000..c099424721a
--- /dev/null
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -0,0 +1,353 @@
+import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { BehaviorSubject, from as observableFrom, Observable, Subscription } from 'rxjs';
+import {
+  concatMap,
+  distinctUntilChanged,
+  filter,
+  map,
+  reduce,
+  scan,
+  startWith,
+  take
+} from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+
+import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataWithNotEmptyPayload,
+  getAllSucceededRemoteData
+} from '../../core/shared/operators';
+import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Group } from '../../core/eperson/models/group.model';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { NotificationsService } from '../notifications/notifications.service';
+import { dateToString, stringToNgbDateStruct } from '../date.util';
+import { followLink } from '../utils/follow-link-config.model';
+import { ADMIN_MODULE_PATH } from '../../app-routing-paths';
+import { GROUP_EDIT_PATH } from '../../+admin/admin-access-control/admin-access-control-routing-paths';
+import { ACCESS_CONTROL_MODULE_PATH } from '../../+admin/admin-routing-paths';
+
+interface ResourcePolicyCheckboxEntry {
+  id: string;
+  policy: ResourcePolicy;
+  checked: boolean
+}
+
+@Component({
+  selector: 'ds-resource-policies',
+  styleUrls: ['./resource-policies.component.scss'],
+  templateUrl: './resource-policies.component.html'
+})
+/**
+ * Component that shows the policies for given resource
+ */
+export class ResourcePoliciesComponent implements OnInit, OnDestroy {
+
+  /**
+   * The resource UUID
+   * @type {string}
+   */
+  @Input() public resourceUUID: string;
+
+  /**
+   * The resource type (e.g. 'item', 'bundle' etc) used as key to build automatically translation label
+   * @type {string}
+   */
+  @Input() public resourceType: string;
+
+  /**
+   * A boolean representing if component is active
+   * @type {boolean}
+   */
+  private isActive: boolean;
+
+  /**
+   * A boolean representing if a submission delete operation is pending
+   * @type {BehaviorSubject<boolean>}
+   */
+  private processingDelete$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The list of policies for given resource
+   * @type {BehaviorSubject<ResourcePolicyCheckboxEntry[]>}
+   */
+  private resourcePoliciesEntries$: BehaviorSubject<ResourcePolicyCheckboxEntry[]> =
+    new BehaviorSubject<ResourcePolicyCheckboxEntry[]>([]);
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {ChangeDetectorRef} cdr
+   * @param {DSONameService} dsoNameService
+   * @param {EPersonDataService} ePersonService
+   * @param {GroupDataService} groupService
+   * @param {NotificationsService} notificationsService
+   * @param {RequestService} requestService
+   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ActivatedRoute} route
+   * @param {Router} router
+   * @param {TranslateService} translate
+   */
+  constructor(
+    private cdr: ChangeDetectorRef,
+    private dsoNameService: DSONameService,
+    private ePersonService: EPersonDataService,
+    private groupService: GroupDataService,
+    private notificationsService: NotificationsService,
+    private requestService: RequestService,
+    private resourcePolicyService: ResourcePolicyService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private translate: TranslateService
+  ) {
+  }
+
+  /**
+   * Initialize the component, setting up the resource's policies
+   */
+  ngOnInit(): void {
+    this.isActive = true;
+    this.initResourcePolicyLIst();
+  }
+
+  /**
+   * Check if there are any selected resource's policies to be deleted
+   *
+   * @return {Observable<boolean>}
+   */
+  canDelete(): Observable<boolean> {
+    return observableFrom(this.resourcePoliciesEntries$.value).pipe(
+      filter((entry: ResourcePolicyCheckboxEntry) => entry.checked),
+      reduce((acc: any, value: any) => [...acc, ...value], []),
+      map((entries: ResourcePolicyCheckboxEntry[]) => isNotEmpty(entries)),
+      distinctUntilChanged()
+    )
+  }
+
+  /**
+   * Delete the selected resource's policies
+   */
+  deleteSelectedResourcePolicies(): void {
+    this.processingDelete$.next(true);
+    const policiesToDelete: ResourcePolicyCheckboxEntry[] = this.resourcePoliciesEntries$.value
+      .filter((entry: ResourcePolicyCheckboxEntry) => entry.checked);
+    this.subs.push(
+      observableFrom(policiesToDelete).pipe(
+        concatMap((entry: ResourcePolicyCheckboxEntry) => this.resourcePolicyService.delete(entry.policy.id)),
+        scan((acc: any, value: any) => [...acc, ...value], []),
+        filter((results: boolean[]) => results.length === policiesToDelete.length),
+        take(1),
+      ).subscribe((results: boolean[]) => {
+        const failureResults = results.filter((result: boolean) => !result);
+        if (isEmpty(failureResults)) {
+          this.notificationsService.success(null, this.translate.get('resource-policies.delete.success.content'));
+        } else {
+          this.notificationsService.error(null, this.translate.get('resource-policies.delete.failure.content'));
+        }
+        this.requestService.setStaleByHrefSubstring(this.resourceUUID);
+        this.processingDelete$.next(false);
+      })
+    )
+  }
+
+  /**
+   * Returns a date in simplified format (YYYY-MM-DD).
+   *
+   * @param date
+   * @return a string with formatted date
+   */
+  formatDate(date: string): string {
+    return isNotEmpty(date) ? dateToString(stringToNgbDateStruct(date)) : '';
+  }
+
+  /**
+   * Return the ePerson's name which the given policy is linked to
+   *
+   * @param policy The resource policy
+   */
+  getEPersonName(policy: ResourcePolicy): Observable<string> {
+    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
+    // return this.ePersonService.findByHref(policy._links.eperson.href).pipe(
+    return policy.eperson.pipe(
+      filter(() => this.isActive),
+      getFirstSucceededRemoteDataWithNotEmptyPayload(),
+      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
+      startWith('')
+    )
+  }
+
+  /**
+   * Return the group's name which the given policy is linked to
+   *
+   * @param policy The resource policy
+   */
+  getGroupName(policy: ResourcePolicy): Observable<string> {
+    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
+    // return this.groupService.findByHref(policy._links.group.href).pipe(
+    return policy.group.pipe(
+      filter(() => this.isActive),
+      getFirstSucceededRemoteDataWithNotEmptyPayload(),
+      map((group: Group) => this.dsoNameService.getName(group)),
+      startWith('')
+    )
+  }
+
+  /**
+   * Return all resource's policies
+   *
+   * @return an observable that emits all resource's policies
+   */
+  getResourcePolicies(): Observable<ResourcePolicyCheckboxEntry[]> {
+    return this.resourcePoliciesEntries$.asObservable();
+  }
+
+  /**
+   * Check whether the given policy is linked to a ePerson
+   *
+   * @param policy The resource policy
+   * @return an observable that emits true when the policy is linked to a ePerson, false otherwise
+   */
+  hasEPerson(policy): Observable<boolean> {
+    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
+    // return this.ePersonService.findByHref(policy._links.eperson.href).pipe(
+    return policy.eperson.pipe(
+      filter(() => this.isActive),
+      getFirstSucceededRemoteDataPayload(),
+      map((eperson: EPerson) => isNotEmpty(eperson)),
+      startWith(false)
+    )
+  }
+
+  /**
+   * Check whether the given policy is linked to a group
+   *
+   * @param policy The resource policy
+   * @return an observable that emits true when the policy is linked to a group, false otherwise
+   */
+  hasGroup(policy): Observable<boolean> {
+    // TODO to be reviewed when https://github.com/DSpace/dspace-angular/issues/644 will be resolved
+    // return this.groupService.findByHref(policy._links.group.href).pipe(
+    return policy.group.pipe(
+      filter(() => this.isActive),
+      getFirstSucceededRemoteDataPayload(),
+      map((group: Group) => isNotEmpty(group)),
+      startWith(false)
+    )
+  }
+
+  /**
+   * Initialize the resource's policies list
+   */
+  initResourcePolicyLIst() {
+    this.requestService.setStaleByHrefSubstring(this.resourceUUID);
+    this.subs.push(this.resourcePolicyService.searchByResource(this.resourceUUID, null, true,
+      followLink('eperson'), followLink('group')).pipe(
+      filter(() => this.isActive),
+      getAllSucceededRemoteData()
+    ).subscribe((result) => {
+      const entries = result.payload.page.map((policy: ResourcePolicy) => ({
+        id: policy.id,
+        policy: policy,
+        checked: false
+      }));
+      this.resourcePoliciesEntries$.next(entries);
+      // Remove cached request
+      this.cdr.detectChanges();
+    }));
+  }
+
+  /**
+   * Return a boolean representing if a delete operation is pending
+   *
+   * @return {Observable<boolean>}
+   */
+  isProcessingDelete(): Observable<boolean> {
+    return this.processingDelete$.asObservable();
+  }
+
+  /**
+   * Redirect to resource policy creation page
+   */
+  redirectToResourcePolicyCreatePage(): void {
+    this.router.navigate([`../create`], {
+      relativeTo: this.route,
+      queryParams: {
+        policyTargetId: this.resourceUUID,
+        targetType: this.resourceType
+      }
+    })
+  }
+
+  /**
+   * Redirect to resource policy editing page
+   *
+   * @param policy The resource policy
+   */
+  redirectToResourcePolicyEditPage(policy: ResourcePolicy): void {
+    this.router.navigate([`../edit`], {
+      relativeTo: this.route,
+      queryParams: {
+        policyId: policy.id
+      }
+    })
+  }
+
+  /**
+   * Redirect to group edit page
+   *
+   * @param policy The resource policy
+   */
+  redirectToGroupEditPage(policy: ResourcePolicy): void {
+    this.requestService.removeByHrefSubstring(policy._links.group.href);
+    this.subs.push(
+      this.groupService.findByHref(policy._links.group.href).pipe(
+        filter(() => this.isActive),
+        getFirstSucceededRemoteDataPayload(),
+        map((group: Group) => group.id)
+      ).subscribe((groupUUID) => {
+        this.router.navigate([ADMIN_MODULE_PATH, ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID])
+      })
+    )
+  }
+
+  /**
+   * Select/unselect all checkbox in the list
+   */
+  selectAllCheckbox(event: any): void {
+    const checked = event.target.checked;
+    this.resourcePoliciesEntries$.value.forEach((entry: ResourcePolicyCheckboxEntry) => entry.checked = checked);
+  }
+
+  /**
+   * Select/unselect checkbox
+   */
+  selectCheckbox(policyEntry: ResourcePolicyCheckboxEntry, checked: boolean) {
+    policyEntry.checked = checked;
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.isActive = false;
+    this.resourcePoliciesEntries$ = null;
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe())
+  }
+
+}
diff --git a/src/app/shared/sass-helper/sass-helper.actions.ts b/src/app/shared/sass-helper/sass-helper.actions.ts
index 82890c074e4..82d0365351f 100644
--- a/src/app/shared/sass-helper/sass-helper.actions.ts
+++ b/src/app/shared/sass-helper/sass-helper.actions.ts
@@ -24,6 +24,5 @@ export class AddCSSVariableAction implements Action {
     this.payload = {name, value};
   }
 }
-/* tslint:enable:max-classes-per-file */
 
 export type CSSVariableAction = AddCSSVariableAction
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index ffd8dd87a25..45339d98d2a 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -109,7 +109,6 @@ describe('SearchFormComponent', () => {
 
 export const objects: DSpaceObject[] = [
   Object.assign(new Community(), {
-    handle: '10673/11',
     logo: {
       self: {
         _isScalar: true,
@@ -162,12 +161,17 @@ export const objects: DSpaceObject[] = [
           language: null,
           value: 'OR2017 - Demonstration'
         }
-      ]
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://localhost:4000/handle/10673/11'
+        }
+      ],
     }
   }),
   Object.assign(new Community(),
     {
-      handle: '10673/1',
       logo: {
         self: {
           _isScalar: true,
@@ -220,7 +224,13 @@ export const objects: DSpaceObject[] = [
             language: null,
             value: 'Sample Community'
           }
-        ]
+        ],
+        'dc.identifier.uri': [
+          {
+            language: null,
+            value: 'http://localhost:4000/handle/10673/1'
+          }
+        ],
       }
     }
   )
diff --git a/src/app/shared/search/facet-config-response.model.ts b/src/app/shared/search/facet-config-response.model.ts
new file mode 100644
index 00000000000..caa51b77fec
--- /dev/null
+++ b/src/app/shared/search/facet-config-response.model.ts
@@ -0,0 +1,35 @@
+import { CacheableObject } from '../../core/cache/object-cache.reducer';
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { FACET_CONFIG_RESPONSE } from './facet-config-response.resouce-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { SearchFilterConfig } from './search-filter-config.model';
+import { deserialize } from 'cerialize';
+import { HALLink } from '../../core/shared/hal-link.model';
+
+/**
+ * The response from the discover/facets endpoint
+ */
+@typedObject
+export class FacetConfigResponse implements CacheableObject {
+  static type = FACET_CONFIG_RESPONSE
+
+  /**
+   * The object type,
+   * hardcoded because rest doesn't a unique one.
+   */
+  @excludeFromEquals
+  type = FACET_CONFIG_RESPONSE;
+
+  /**
+   * the filters in this response
+   */
+  filters: SearchFilterConfig[];
+
+  /**
+   * The {@link HALLink}s for this SearchFilterConfig
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+  }
+}
diff --git a/src/app/shared/search/facet-config-response.resouce-type.ts b/src/app/shared/search/facet-config-response.resouce-type.ts
new file mode 100644
index 00000000000..7c3bdef7cae
--- /dev/null
+++ b/src/app/shared/search/facet-config-response.resouce-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../core/shared/resource-type';
+
+/**
+ * The resource type for FacetConfigResponse
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const FACET_CONFIG_RESPONSE = new ResourceType('discovery-facets');
diff --git a/src/app/shared/search/facet-values.model.ts b/src/app/shared/search/facet-values.model.ts
new file mode 100644
index 00000000000..67bd9c7d30b
--- /dev/null
+++ b/src/app/shared/search/facet-values.model.ts
@@ -0,0 +1,46 @@
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { FACET_VALUES } from './facet-values.resource-type';
+import { FacetValue } from './facet-value.model';
+import { SearchQueryResponse } from './search-query-response.model';
+import { autoserializeAs, autoserialize, inheritSerialization } from 'cerialize';
+import { FilterType } from './filter-type.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+
+@typedObject
+@inheritSerialization(PaginatedList)
+@inheritSerialization(SearchQueryResponse)
+export class FacetValues extends SearchQueryResponse<FacetValue> {
+  static type = FACET_VALUES;
+
+  /**
+   * The sort parameters used in the search request
+   * Hardcoded because rest doesn't provide a unique type
+   */
+  @excludeFromEquals
+  public type = FACET_VALUES;
+
+  /**
+   * The name of the facet the values are for
+   */
+  @autoserialize
+  name: string
+
+  /**
+   * The type of facet the values are for
+   */
+  @autoserializeAs(String, 'facetType')
+  filterType: FilterType;
+
+  /**
+   * The max number of returned facetValues
+   */
+  @autoserialize
+  facetLimit: number
+
+  /**
+   * The results for this query
+   */
+  @autoserializeAs(FacetValue, 'values')
+  page: FacetValue[];
+}
diff --git a/src/app/shared/search/facet-values.resource-type.ts b/src/app/shared/search/facet-values.resource-type.ts
new file mode 100644
index 00000000000..e1042bbbc0d
--- /dev/null
+++ b/src/app/shared/search/facet-values.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../core/shared/resource-type';
+
+/**
+ * The resource type for FacetValues
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const FACET_VALUES = new ResourceType('discovery-facetvalues');
diff --git a/src/app/shared/search/paginated-search-options.model.spec.ts b/src/app/shared/search/paginated-search-options.model.spec.ts
index 1739fd54fb0..c8bef4b7218 100644
--- a/src/app/shared/search/paginated-search-options.model.spec.ts
+++ b/src/app/shared/search/paginated-search-options.model.spec.ts
@@ -13,7 +13,7 @@ describe('PaginatedSearchOptions', () => {
   const scope = '0fde1ecb-82cc-425a-b600-ac3576d76b47';
   const baseUrl = 'www.rest.com';
   beforeEach(() => {
-    options = new PaginatedSearchOptions({sort: sortOptions, pagination: pageOptions, filters: filters, query: query, scope: scope, dsoType: DSpaceObjectType.ITEM});
+    options = new PaginatedSearchOptions({sort: sortOptions, pagination: pageOptions, filters: filters, query: query, scope: scope, dsoTypes: [DSpaceObjectType.ITEM]});
   });
 
   describe('when toRestUrl is called', () => {
diff --git a/src/app/shared/search/paginated-search-options.model.ts b/src/app/shared/search/paginated-search-options.model.ts
index 13ab4cabeae..950b207c3a4 100644
--- a/src/app/shared/search/paginated-search-options.model.ts
+++ b/src/app/shared/search/paginated-search-options.model.ts
@@ -12,7 +12,7 @@ export class PaginatedSearchOptions extends SearchOptions {
   pagination?: PaginationComponentOptions;
   sort?: SortOptions;
 
-  constructor(options: {configuration?: string, scope?: string, query?: string, dsoType?: DSpaceObjectType, filters?: SearchFilter[], fixedFilter?: any, pagination?: PaginationComponentOptions, sort?: SortOptions}) {
+  constructor(options: {configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[], fixedFilter?: any, pagination?: PaginationComponentOptions, sort?: SortOptions}) {
     super(options);
     this.pagination = options.pagination;
     this.sort = options.sort;
diff --git a/src/app/shared/search/search-filter-config.model.ts b/src/app/shared/search/search-filter-config.model.ts
index dc6fef1f87a..fec755fd953 100644
--- a/src/app/shared/search/search-filter-config.model.ts
+++ b/src/app/shared/search/search-filter-config.model.ts
@@ -1,10 +1,24 @@
-  import { FilterType } from './filter-type.model';
-  import { autoserialize, autoserializeAs } from 'cerialize';
+import { FilterType } from './filter-type.model';
+import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import { HALLink } from '../../core/shared/hal-link.model';
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../core/cache/object-cache.reducer';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { SEARCH_FILTER_CONFIG } from './search-filter-config.resource-type';
 
   /**
    * The configuration for a search filter
    */
-  export class SearchFilterConfig {
+@typedObject
+  export class SearchFilterConfig implements CacheableObject {
+    static type = SEARCH_FILTER_CONFIG;
+
+    /**
+     * The object type,
+     * hardcoded because rest doesn't set one.
+     */
+    @excludeFromEquals
+    type = SEARCH_FILTER_CONFIG;
 
     /**
      * The name of this filter
@@ -16,7 +30,7 @@
      * The FilterType of this filter
      */
     @autoserializeAs(String, 'facetType')
-    type: FilterType;
+    filterType: FilterType;
 
     /**
      * True if the filter has facets
@@ -48,6 +62,14 @@
     @autoserialize
     minValue: string;
 
+    /**
+     * The {@link HALLink}s for this SearchFilterConfig
+     */
+    @deserialize
+    _links: {
+      self: HALLink;
+    }
+
     /**
      * Name of this configuration that can be used in a url
      * @returns Parameter name
diff --git a/src/app/shared/search/search-filter-config.resource-type.ts b/src/app/shared/search/search-filter-config.resource-type.ts
new file mode 100644
index 00000000000..c2da308207c
--- /dev/null
+++ b/src/app/shared/search/search-filter-config.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../core/shared/resource-type';
+
+/**
+ * The resource type for SearchFilterConfig
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SEARCH_FILTER_CONFIG = new ResourceType('discovery-filter');
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index 5dc930f67fc..7a20fd5ff0a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -1,9 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-
 import { FilterType } from '../../../filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { FacetValue } from '../../../facet-value.model';
 
 @Component({
   selector: 'ds-search-authority-filter',
@@ -17,20 +15,4 @@ import { FacetValue } from '../../../facet-value.model';
  */
 @renderFacetFor(FilterType.authority)
 export class SearchAuthorityFilterComponent extends SearchFacetFilterComponent implements OnInit {
-
-  /**
-   * TODO to review after https://github.com/DSpace/dspace-angular/issues/368 is resolved
-   * Retrieve facet value from search link
-   */
-  protected getFacetValue(facet: FacetValue): string {
-    const search = facet._links.search.href;
-    const hashes = search.slice(search.indexOf('?') + 1).split('&');
-    const params = {};
-    hashes.map((hash) => {
-      const [key, val] = hash.split('=');
-      params[key] = decodeURIComponent(val)
-    });
-
-    return params[this.filterConfig.paramName];
-  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 4f85411d853..a8c1b13ce40 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -27,7 +27,7 @@ describe('SearchFacetOptionComponent', () => {
 
   const mockFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
-    type: FilterType.range,
+    filterType: FilterType.range,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2,
@@ -37,7 +37,7 @@ describe('SearchFacetOptionComponent', () => {
 
   const mockAuthorityFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName2,
-    type: FilterType.authority,
+    filterType: FilterType.authority,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2
@@ -130,7 +130,7 @@ describe('SearchFacetOptionComponent', () => {
       comp.addQueryParams = {};
       (comp as any).updateAddParams(selectedValues);
       expect(comp.addQueryParams).toEqual({
-        [mockFilterConfig.paramName]: [value1, value.value],
+        [mockFilterConfig.paramName]: [`${value1},${operator}`, value.value + ',equals'],
         page: 1
       });
     });
@@ -145,7 +145,7 @@ describe('SearchFacetOptionComponent', () => {
       comp.addQueryParams = {};
       (comp as any).updateAddParams(selectedValues);
       expect(comp.addQueryParams).toEqual({
-        [mockAuthorityFilterConfig.paramName]: [value1, `${value2},${operator}`],
+        [mockAuthorityFilterConfig.paramName]: [value1 + ',equals', `${value2},${operator}`],
         page: 1
       });
     });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index 04e810eddaf..7148682b0e6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -8,8 +8,8 @@ import { SearchService } from '../../../../../../core/shared/search/search.servi
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { hasValue } from '../../../../../empty.util';
-import { FilterType } from '../../../../filter-type.model';
 import { currentPath } from '../../../../../utils/route.utils';
+import { getFacetValueForType } from '../../../../search.utils';
 
 @Component({
   selector: 'ds-search-facet-option',
@@ -102,7 +102,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
    */
   private updateAddParams(selectedValues: FacetValue[]): void {
     this.addQueryParams = {
-      [this.filterConfig.paramName]: [...selectedValues.map((facetValue: FacetValue) => facetValue.label), this.getFacetValue()],
+      [this.filterConfig.paramName]: [...selectedValues.map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)), this.getFacetValue()],
       page: 1
     };
   }
@@ -112,19 +112,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
    * Retrieve facet value related to facet type
    */
   private getFacetValue(): string {
-    if (this.filterConfig.type === FilterType.authority) {
-      const search = this.filterValue._links.search.href;
-      const hashes = search.slice(search.indexOf('?') + 1).split('&');
-      const params = {};
-      hashes.map((hash) => {
-        const [key, val] = hash.split('=');
-        params[key] = decodeURIComponent(val)
-      });
-
-      return params[this.filterConfig.paramName];
-    } else {
-      return this.filterValue.value;
-    }
+    return getFacetValueForType(this.filterValue, this.filterConfig);
   }
 
   /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index a27a5d3d868..4bcfc029668 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -3,6 +3,6 @@
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
     <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>
     <span class="filter-value pl-1 text-capitalize">
-        {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.value} }}
+        {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.label} }}
     </span>
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
index fd9617cec44..4837783a108 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
@@ -27,7 +27,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
   const operator = 'authority';
   const mockFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
-    type: FilterType.range,
+    filterType: FilterType.range,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2,
@@ -36,7 +36,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
   });
   const mockAuthorityFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName2,
-    type: FilterType.authority,
+    filterType: FilterType.authority,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index f58a903b0cd..4fd9a62bf68 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -7,8 +7,8 @@ import { SearchFilterService } from '../../../../../../core/shared/search/search
 import { hasValue } from '../../../../../empty.util';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { FacetValue } from '../../../../facet-value.model';
-import { FilterType } from '../../../../filter-type.model';
 import { currentPath } from '../../../../../utils/route.utils';
+import { getFacetValueForType } from '../../../../search.utils';
 
 @Component({
   selector: 'ds-search-facet-selected-option',
@@ -101,19 +101,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
    * Retrieve facet value related to facet type
    */
   private getFacetValue(facetValue: FacetValue): string {
-    if (this.filterConfig.type === FilterType.authority) {
-      const search = facetValue._links.search.href;
-      const hashes = search.slice(search.indexOf('?') + 1).split('&');
-      const params = {};
-      hashes.map((hash) => {
-        const [key, val] = hash.split('=');
-        params[key] = decodeURIComponent(val)
-      });
-
-      return params[this.filterConfig.paramName];
-    } else {
-      return facetValue.value;
-    }
+    return getFacetValueForType(facetValue, this.filterConfig);
   }
 
   /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index da0d1776e30..6674b090a73 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -55,7 +55,7 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
    * Find the correct component based on the filter config's type
    */
   private getSearchFilter() {
-    const type: FilterType = this.filterConfig.type;
+    const type: FilterType = this.filterConfig.filterType;
     return renderFilterType(type);
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 376aa7ba3ae..967b933d7ec 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -2,7 +2,11 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import {
+  FILTER_CONFIG,
+  IN_PLACE_SEARCH,
+  SearchFilterService
+} from '../../../../../core/shared/search/search-filter.service';
 import { SearchFilterConfig } from '../../../search-filter-config.model';
 import { FilterType } from '../../../filter-type.model';
 import { FacetValue } from '../../../facet-value.model';
@@ -10,7 +14,7 @@ import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RouterStub } from '../../../../testing/router.stub';
 import { Router } from '@angular/router';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
@@ -29,7 +33,7 @@ describe('SearchFacetFilterComponent', () => {
   const value3 = 'another value3';
   const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
-    type: FilterType.text,
+    filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2
@@ -81,7 +85,7 @@ describe('SearchFacetFilterComponent', () => {
   let router;
   const page = observableOf(0);
 
-  const mockValues = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), values));
+  const mockValues = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), values));
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
@@ -208,7 +212,7 @@ describe('SearchFacetFilterComponent', () => {
 
     it('should call navigate on the router with the right searchlink and parameters', () => {
       expect(router.navigate).toHaveBeenCalledWith(searchUrl.split('/'), {
-        queryParams: { [mockFilterConfig.paramName]: [...selectedValues, testValue] },
+        queryParams: { [mockFilterConfig.paramName]: [...selectedValues.map((value) => `${value},equals`), testValue] },
         queryParamsHandling: 'merge'
       });
     });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index df0c53f5431..683218106ee 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -11,7 +11,7 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
 import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { hasNoValue, hasValue, isNotEmpty } from '../../../../empty.util';
 import { EmphasizePipe } from '../../../../utils/emphasize.pipe';
@@ -20,11 +20,13 @@ import { SearchFilterConfig } from '../../../search-filter-config.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { getSucceededRemoteData } from '../../../../../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
 import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { SearchOptions } from '../../../search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../../../utils/route.utils';
+import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
+import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -100,7 +102,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   ngOnInit(): void {
     this.currentUrl = this.router.url;
-    this.filterValues$ = new BehaviorSubject(new RemoteData(true, false, undefined, undefined, undefined));
+    this.filterValues$ = new BehaviorSubject(createPendingRemoteDataObject());
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
 
     this.searchOptions$ = this.searchConfigService.searchOptions;
@@ -112,7 +114,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
       switchMap(({ options, page }) => {
         return this.searchService.getFacetValuesFor(this.filterConfig, page, options)
           .pipe(
-            getSucceededRemoteData(),
+            getFirstSucceededRemoteData(),
             map((results) => {
                 return {
                   values: observableOf(results),
@@ -148,7 +150,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
                 if (hasValue(fValue)) {
                   return fValue;
                 }
-                return Object.assign(new FacetValue(), { label: value, value: value });
+                return Object.assign(new FacetValue(), { label: stripOperatorFromFilterValue(value), value: value });
               });
             })
           );
@@ -281,13 +283,13 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
         (options) => {
           this.filterSearchResults = this.searchService.getFacetValuesFor(this.filterConfig, 1, options, data.toLowerCase())
             .pipe(
-              getSucceededRemoteData(),
+              getFirstSucceededRemoteData(),
               map(
                 (rd: RemoteData<PaginatedList<FacetValue>>) => {
                   return rd.payload.page.map((facet) => {
                     return {
                       displayValue: this.getDisplayValue(facet, data),
-                      value: this.getFacetValue(facet)
+                      value: stripOperatorFromFilterValue(this.getFacetValue(facet))
                     }
                   })
                 }
@@ -303,7 +305,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    * Retrieve facet value
    */
   protected getFacetValue(facet: FacetValue): string {
-    return facet.value;
+    return getFacetValueForType(facet, this.filterConfig);
   }
 
   /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 857ba8d4611..aa98d06fb10 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -10,7 +10,6 @@ import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchFilterComponent } from './search-filter.component';
 import { SearchFilterConfig } from '../../search-filter-config.model';
 import { FilterType } from '../../filter-type.model';
-import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
 import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
 
@@ -24,7 +23,7 @@ describe('SearchFilterComponent', () => {
   const nonExistingFilter2 = 'non existing 2';
   const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
-    type: FilterType.text,
+    filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index a54f593c648..a66b2a5585e 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject, Input, OnInit } from '@angular/core';
 
 import { Observable, of as observableOf } from 'rxjs';
-import { filter, first, map, startWith, switchMap, take } from 'rxjs/operators';
+import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
 
 import { SearchFilterConfig } from '../../search-filter-config.model';
 import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 0038419440f..c66f367e25a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -10,7 +10,7 @@ import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs'
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { PaginatedList, buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RouterStub } from '../../../../testing/router.stub';
 import { Router } from '@angular/router';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
@@ -33,7 +33,7 @@ describe('SearchRangeFilterComponent', () => {
   const value3 = '1990 - 1992';
   const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
     name: filterName1,
-    type: FilterType.range,
+    filterType: FilterType.range,
     hasFacets: false,
     isOpenByDefault: false,
     pageSize: 2,
@@ -87,7 +87,7 @@ describe('SearchRangeFilterComponent', () => {
   let router;
   const page = observableOf(0);
 
-  const mockValues = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), values));
+  const mockValues = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), values));
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index 678cbbfdd5e..b2b44ce219d 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -5,6 +5,9 @@ import {
   SearchFacetFilterComponent
 } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
+import {
+  addOperatorToFilterValue,
+} from '../../../search.utils';
 
 /**
  * This component renders a simple item page.
@@ -24,4 +27,12 @@ import { renderFacetFor } from '../search-filter-type-decorator';
  */
 @renderFacetFor(FilterType.text)
 export class SearchTextFilterComponent extends SearchFacetFilterComponent implements OnInit {
+  /**
+   * Submits a new active custom value to the filter from the input field
+   * Overwritten method from parent component, adds the "query" operator to the received data before passing it on
+   * @param data The string from the input field
+   */
+  onSubmit(data: any) {
+    super.onSubmit(addOperatorToFilterValue(data, 'query'));
+  }
 }
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 78c40501e68..30317de1a5c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -8,7 +8,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { SearchFilterConfig } from '../search-filter-config.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { Router } from '@angular/router';
@@ -59,7 +59,7 @@ export class SearchFiltersComponent implements OnInit {
 
   ngOnInit(): void {
     this.filters = this.searchConfigService.searchOptions.pipe(
-      switchMap((options) => this.searchService.getConfig(options.scope, options.configuration).pipe(getSucceededRemoteData())),
+      switchMap((options) => this.searchService.getConfig(options.scope, options.configuration).pipe(getFirstSucceededRemoteData())),
     );
 
     this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(map((filters) => {
diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
index 154b888269b..2322c80acf1 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -3,6 +3,8 @@ import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.c
 import { Observable } from 'rxjs';
 import { Params, Router } from '@angular/router';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { map } from 'rxjs/operators';
+import { stripOperatorFromFilterValue } from '../search.utils';
 
 @Component({
   selector: 'ds-search-labels',
@@ -30,6 +32,15 @@ export class SearchLabelsComponent {
   constructor(
     protected router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
-    this.appliedFilters = this.searchConfigService.getCurrentFrontendFilters();
+    this.appliedFilters = this.searchConfigService.getCurrentFrontendFilters().pipe(
+      map((params) => {
+        const labels = {};
+        Object.keys(params)
+          .forEach((key) => {
+            labels[key] = [...params[key].map((value) => stripOperatorFromFilterValue(value))];
+          });
+        return labels;
+      })
+    );
   }
 }
diff --git a/src/app/shared/search/search-objects.model.ts b/src/app/shared/search/search-objects.model.ts
new file mode 100644
index 00000000000..23f686da177
--- /dev/null
+++ b/src/app/shared/search/search-objects.model.ts
@@ -0,0 +1,31 @@
+import { autoserializeAs, inheritSerialization } from 'cerialize';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { SearchResult } from './search-result.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { SEARCH_OBJECTS } from './search-objects.resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { SearchQueryResponse } from './search-query-response.model';
+
+/**
+ * Class representing the response returned by the server when performing a search request
+ */
+@typedObject
+@inheritSerialization(PaginatedList)
+@inheritSerialization(SearchQueryResponse)
+export class SearchObjects<T extends DSpaceObject> extends SearchQueryResponse<SearchResult<T>> {
+  static type = SEARCH_OBJECTS;
+
+  /**
+   * The sort parameters used in the search request
+   * Hardcoded because rest doesn't provide a unique type
+   */
+  @excludeFromEquals
+  public type = SEARCH_OBJECTS;
+
+  /**
+   * The results for this query
+   */
+  @autoserializeAs(SearchResult, 'objects')
+  page: Array<SearchResult<T>>;
+}
diff --git a/src/app/shared/search/search-objects.resource-type.ts b/src/app/shared/search/search-objects.resource-type.ts
new file mode 100644
index 00000000000..cf5d7c9c9e2
--- /dev/null
+++ b/src/app/shared/search/search-objects.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../core/shared/resource-type';
+
+/**
+ * The resource type for SearchObjects
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SEARCH_OBJECTS = new ResourceType('discovery-objects');
diff --git a/src/app/shared/search/search-options.model.spec.ts b/src/app/shared/search/search-options.model.spec.ts
index 3195ec3660e..7982eba6d30 100644
--- a/src/app/shared/search/search-options.model.spec.ts
+++ b/src/app/shared/search/search-options.model.spec.ts
@@ -10,7 +10,7 @@ describe('SearchOptions', () => {
   const scope = '0fde1ecb-82cc-425a-b600-ac3576d76b47';
   const baseUrl = 'www.rest.com';
   beforeEach(() => {
-    options = new SearchOptions({ filters: filters, query: query, scope: scope , dsoType: DSpaceObjectType.ITEM});
+    options = new SearchOptions({ filters: filters, query: query, scope: scope , dsoTypes: [DSpaceObjectType.ITEM]});
   });
 
   describe('when toRestUrl is called', () => {
diff --git a/src/app/shared/search/search-options.model.ts b/src/app/shared/search/search-options.model.ts
index 7d5f4dd207e..387ae6a5178 100644
--- a/src/app/shared/search/search-options.model.ts
+++ b/src/app/shared/search/search-options.model.ts
@@ -12,15 +12,15 @@ export class SearchOptions {
   view?: ViewMode = ViewMode.ListElement;
   scope?: string;
   query?: string;
-  dsoType?: DSpaceObjectType;
+  dsoTypes?: DSpaceObjectType[];
   filters?: any;
   fixedFilter?: any;
 
-  constructor(options: {configuration?: string, scope?: string, query?: string, dsoType?: DSpaceObjectType, filters?: SearchFilter[], fixedFilter?: any}) {
+  constructor(options: {configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[], fixedFilter?: any}) {
       this.configuration = options.configuration;
       this.scope = options.scope;
       this.query = options.query;
-      this.dsoType = options.dsoType;
+      this.dsoTypes = options.dsoTypes;
       this.filters = options.filters;
       this.fixedFilter = options.fixedFilter;
   }
@@ -44,8 +44,10 @@ export class SearchOptions {
     if (isNotEmpty(this.scope)) {
       args.push(`scope=${this.scope}`);
     }
-    if (isNotEmpty(this.dsoType)) {
-      args.push(`dsoType=${this.dsoType}`);
+    if (isNotEmpty(this.dsoTypes)) {
+      this.dsoTypes.forEach((dsoType: string) => {
+        args.push(`dsoType=${dsoType}`);
+      })
     }
     if (isNotEmpty(this.filters)) {
       this.filters.forEach((filter: SearchFilter) => {
diff --git a/src/app/shared/search/search-query-response.model.ts b/src/app/shared/search/search-query-response.model.ts
index 2c9d11e2b3e..77e513a9180 100644
--- a/src/app/shared/search/search-query-response.model.ts
+++ b/src/app/shared/search/search-query-response.model.ts
@@ -1,12 +1,11 @@
-import { autoserialize, autoserializeAs } from 'cerialize';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { autoserialize } from 'cerialize';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { SearchResult } from './search-result.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 
 /**
  * Class representing the response returned by the server when performing a search request
  */
-export class SearchQueryResponse {
+export abstract class SearchQueryResponse<T> extends PaginatedList<T> {
   /**
    * The scope used in the search request represented by the UUID of a DSpaceObject
    */
@@ -37,54 +36,18 @@ export class SearchQueryResponse {
   @autoserialize
   configuration: string;
 
-  /**
-   * The sort parameters used in the search request
-   */
-  @autoserialize
-  public type: string;
-
   /**
    * Pagination configuration for this response
    */
   @autoserialize
-  page: PageInfo;
+  pageInfo: PageInfo;
 
   /**
    * The results for this query
    */
-  @autoserializeAs(SearchResult)
-  objects: Array<SearchResult<DSpaceObject>>;
-
-  @autoserialize
-  facets: any; // TODO
-
-  /**
-   * The REST url to retrieve the current response
-   */
-  @autoserialize
-  self: string;
-
-  /**
-   * The REST url to retrieve the next response
-   */
   @autoserialize
-  next: string;
+  page: T[];
 
-  /**
-   * The REST url to retrieve the previous response
-   */
   @autoserialize
-  previous: string;
-
-  /**
-   * The REST url to retrieve the first response
-   */
-  @autoserialize
-  first: string;
-
-  /**
-   * The REST url to retrieve the last response
-   */
-  @autoserialize
-  last: string;
+  facets: any; // TODO
 }
diff --git a/src/app/shared/search/search-result.model.ts b/src/app/shared/search/search-result.model.ts
index 2f14a60c970..a63f5acf136 100644
--- a/src/app/shared/search/search-result.model.ts
+++ b/src/app/shared/search/search-result.model.ts
@@ -1,17 +1,26 @@
 import { autoserialize, deserialize } from 'cerialize';
-import { link } from '../../core/cache/builders/build-decorators';
+import { typedObject } from '../../core/cache/builders/build-decorators';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DSPACE_OBJECT } from '../../core/shared/dspace-object.resource-type';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
 import { HALLink } from '../../core/shared/hal-link.model';
 import { MetadataMap } from '../../core/shared/metadata.models';
 import { excludeFromEquals, fieldsForEquals } from '../../core/utilities/equals.decorators';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { HALResource } from '../../core/shared/hal-resource.model';
+import { SEARCH_RESULT } from './search-result.resource-type';
 
 /**
  * Represents a search result object of a certain (<T>) DSpaceObject
  */
-export class SearchResult<T extends DSpaceObject> extends ListableObject {
+@typedObject
+export class SearchResult<T extends DSpaceObject> extends ListableObject implements HALResource {
+  static type = SEARCH_RESULT
+
+  /**
+   * Doesn't get a type in the rest response, so it's hardcoded
+   */
+  type = SEARCH_RESULT;
+
   /**
    * The metadata that was used to find this item, hithighlighted
    */
@@ -32,7 +41,6 @@ export class SearchResult<T extends DSpaceObject> extends ListableObject {
    * The DSpaceObject that was found
    */
   @fieldsForEquals('uuid')
-  @link(DSPACE_OBJECT)
   indexableObject: T;
 
   /**
diff --git a/src/app/shared/search/search-result.resource-type.ts b/src/app/shared/search/search-result.resource-type.ts
new file mode 100644
index 00000000000..4e18f17db67
--- /dev/null
+++ b/src/app/shared/search/search-result.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../core/shared/resource-type';
+
+/**
+ * The resource type for SearchResult
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SEARCH_RESULT = new ResourceType('searchresult');
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index cbc56d1080a..6e7d9c76bfb 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -18,13 +18,13 @@ <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.
         *ngIf="hasNoValue(searchResults) || hasNoValue(searchResults.payload) || searchResults.isLoading"
         message="{{'loading.search-results' | translate}}"></ds-loading>
 <ds-error
-        *ngIf="searchResults?.hasFailed && (!searchResults?.error || searchResults?.error?.statusCode != 400)"
+        *ngIf="searchResults?.hasFailed && (!searchResults?.errorMessage || searchResults?.statusCode != 400)"
         message="{{'error.search-results' | translate}}"></ds-error>
-<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.error?.statusCode == 400">
+<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.statusCode == 400">
     {{ 'search.results.no-results' | translate }}
     <a [routerLink]="['/search']"
        [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
        queryParamsHandling="merge">
         {{"search.results.no-results-link" | translate}}
     </a>
-</div> 
+</div>
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index b4586129e20..d6833773d68 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -1,12 +1,12 @@
-import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ResourceType } from '../../../core/shared/resource-type';
 import { Community } from '../../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+import { createFailedRemoteDataObject } from '../../remote-data.utils';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -46,13 +46,13 @@ describe('SearchResultsComponent', () => {
   });
 
   it('should display error message if error is != 400', () => {
-    (comp as any).searchResults = { hasFailed: true, error: { statusCode: 500 } };
+    (comp as any).searchResults = createFailedRemoteDataObject('Error', 500);
     fixture.detectChanges();
     expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
   });
 
   it('should display link with new search where query is quoted if search return a error 400', () => {
-    (comp as any).searchResults = { hasFailed: true, error: { statusCode: 400 } };
+    (comp as any).searchResults = createFailedRemoteDataObject('Error', 400);
     (comp as any).searchConfig = { query: 'foobar' };
     fixture.detectChanges();
 
@@ -96,7 +96,6 @@ describe('SearchResultsComponent', () => {
 
 export const objects = [
   Object.assign(new Community(), {
-    handle: '10673/11',
     logo: {
       self: {
         _isScalar: true,
@@ -149,12 +148,17 @@ export const objects = [
           language: null,
           value: 'OR2017 - Demonstration'
         }
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://localhost:4000/handle/10673/11'
+        }
       ]
     }
   }),
   Object.assign(new Community(),
     {
-      handle: '10673/1',
       logo: {
         self: {
           _isScalar: true,
@@ -207,6 +211,12 @@ export const objects = [
             language: null,
             value: 'Sample Community'
           }
+        ],
+        'dc.identifier.uri': [
+          {
+            language: null,
+            value: 'http://localhost:4000/handle/10673/1'
+          }
         ]
       }
     }
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index e0719c82884..de87f6b187d 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -3,7 +3,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { fadeIn, fadeInOut } from '../../animations/fade';
 import { SearchResult } from '../search-result.model';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { hasNoValue, isNotEmpty } from '../../empty.util';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
diff --git a/src/app/shared/search/search.utils.spec.ts b/src/app/shared/search/search.utils.spec.ts
new file mode 100644
index 00000000000..3690b1357d6
--- /dev/null
+++ b/src/app/shared/search/search.utils.spec.ts
@@ -0,0 +1,135 @@
+import { FacetValue } from './facet-value.model';
+import { SearchFilterConfig } from './search-filter-config.model';
+import {
+  addOperatorToFilterValue,
+  getFacetValueForType,
+  stripOperatorFromFilterValue,
+  escapeRegExp
+} from './search.utils';
+
+describe('Search Utils', () => {
+  describe('getFacetValueForType', () => {
+    let facetValueWithSearchHref: FacetValue;
+    let facetValueWithoutSearchHref: FacetValue;
+    let searchFilterConfig: SearchFilterConfig;
+
+    beforeEach(() => {
+      facetValueWithSearchHref = Object.assign(new FacetValue(), {
+        value: 'Value with search href',
+        _links: {
+          search: {
+            href: 'rest/api/search?f.otherFacet=Other facet value,operator&f.facetName=Value with search href,operator'
+          }
+        }
+      });
+      facetValueWithoutSearchHref = Object.assign(new FacetValue(), {
+        value: 'Value without search href'
+      });
+      searchFilterConfig = Object.assign(new SearchFilterConfig(), {
+        name: 'facetName'
+      });
+    });
+
+    it('should retrieve the correct value from the search href', () => {
+      expect(getFacetValueForType(facetValueWithSearchHref, searchFilterConfig)).toEqual('Value with search href,operator');
+    });
+
+    it('should return the facet value with an equals operator by default', () => {
+      expect(getFacetValueForType(facetValueWithoutSearchHref, searchFilterConfig)).toEqual('Value without search href,equals');
+    });
+  });
+
+  describe('stripOperatorFromFilterValue', () => {
+    it('should strip the operator from the value', () => {
+      expect(stripOperatorFromFilterValue('value,operator')).toEqual('value');
+    });
+  });
+
+  describe('addOperatorToFilterValue', () => {
+    it('should add the operator to the value', () => {
+      expect(addOperatorToFilterValue('value', 'operator')).toEqual('value,operator');
+    });
+
+    it('shouldn\'t add the operator to the value if it already contains the operator', () => {
+      expect(addOperatorToFilterValue('value,operator', 'operator')).toEqual('value,operator');
+    });
+  });
+
+  describe(`escapeRegExp`, () => {
+    it(`should escape all occurrences of '.' in the input string`, () => {
+      const input = `a.string.with.a.number.of.'.'s.in.it`;
+      const expected = `a\\.string\\.with\\.a\\.number\\.of\\.'\\.'s\\.in\\.it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '*' in the input string`, () => {
+      const input = `a*string*with*a*number*of*'*'s*in*it`;
+      const expected = `a\\*string\\*with\\*a\\*number\\*of\\*'\\*'s\\*in\\*it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '+' in the input string`, () => {
+      const input = `a+string+with+a+number+of+'+'s+in+it`;
+      const expected = `a\\+string\\+with\\+a\\+number\\+of\\+'\\+'s\\+in\\+it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '-' in the input string`, () => {
+      const input = `a-string-with-a-number-of-'-'s-in-it`;
+      const expected = `a\\-string\\-with\\-a\\-number\\-of\\-'\\-'s\\-in\\-it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '?' in the input string`, () => {
+      const input = `a?string?with?a?number?of?'?'s?in?it`;
+      const expected = `a\\?string\\?with\\?a\\?number\\?of\\?'\\?'s\\?in\\?it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '^' in the input string`, () => {
+      const input = `a^string^with^a^number^of^'^'s^in^it`;
+      const expected = `a\\^string\\^with\\^a\\^number\\^of\\^'\\^'s\\^in\\^it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '$' in the input string`, () => {
+      const input = `a$string$with$a$number$of$'$'s$in$it`;
+      const expected = `a\\$string\\$with\\$a\\$number\\$of\\$'\\$'s\\$in\\$it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '{' in the input string`, () => {
+      const input = `a{string{with{a{number{of{'{'s{in{it`;
+      const expected = `a\\{string\\{with\\{a\\{number\\{of\\{'\\{'s\\{in\\{it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '}' in the input string`, () => {
+      const input = `a}string}with}a}number}of}'}'s}in}it`;
+      const expected = `a\\}string\\}with\\}a\\}number\\}of\\}'\\}'s\\}in\\}it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '(' in the input string`, () => {
+      const input = `a(string(with(a(number(of('('s(in(it`;
+      const expected = `a\\(string\\(with\\(a\\(number\\(of\\('\\('s\\(in\\(it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of ')' in the input string`, () => {
+      const input = `a)string)with)a)number)of)')'s)in)it`;
+      const expected = `a\\)string\\)with\\)a\\)number\\)of\\)'\\)'s\\)in\\)it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '|' in the input string`, () => {
+      const input = `a|string|with|a|number|of|'|'s|in|it`;
+      const expected = `a\\|string\\|with\\|a\\|number\\|of\\|'\\|'s\\|in\\|it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '[' in the input string`, () => {
+      const input = `a[string[with[a[number[of['['s[in[it`;
+      const expected = `a\\[string\\[with\\[a\\[number\\[of\\['\\['s\\[in\\[it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of ']' in the input string`, () => {
+      const input = `a]string]with]a]number]of]']'s]in]it`;
+      const expected = `a\\]string\\]with\\]a\\]number\\]of\\]'\\]'s\\]in\\]it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+    it(`should escape all occurrences of '\' in the input string`, () => {
+      const input = `a\\string\\with\\a\\number\\of\\'\\'s\\in\\it`;
+      const expected = `a\\\\string\\\\with\\\\a\\\\number\\\\of\\\\'\\\\'s\\\\in\\\\it`;
+      expect(escapeRegExp(input)).toEqual(expected);
+    });
+  });
+});
diff --git a/src/app/shared/search/search.utils.ts b/src/app/shared/search/search.utils.ts
new file mode 100644
index 00000000000..38c5f568cb4
--- /dev/null
+++ b/src/app/shared/search/search.utils.ts
@@ -0,0 +1,53 @@
+import { FacetValue } from './facet-value.model';
+import { SearchFilterConfig } from './search-filter-config.model';
+import { isNotEmpty } from '../empty.util';
+
+/**
+ * Get a facet's value by matching its parameter in the search href, this will include the operator of the facet value
+ * If the {@link FacetValue} doesn't contain a search link, its raw value will be returned as a fallback
+ * @param facetValue
+ * @param searchFilterConfig
+ */
+export function getFacetValueForType(facetValue: FacetValue, searchFilterConfig: SearchFilterConfig): string {
+  const regex = new RegExp(`[?|&]${escapeRegExp(searchFilterConfig.paramName)}=(${escapeRegExp(facetValue.value)}[^&]*)`, 'g');
+  if (isNotEmpty(facetValue._links)) {
+    const values = regex.exec(facetValue._links.search.href);
+    if (isNotEmpty(values)) {
+      return values[1];
+    }
+  }
+  return addOperatorToFilterValue(facetValue.value, 'equals');
+}
+
+/**
+ * Escape a string to be used in a JS regular expression
+ *
+ * @param input the string to escape
+ */
+export function escapeRegExp(input: string): string {
+  return input.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+}
+
+/**
+ * Strip the operator from a filter value
+ * Warning: This expects the value to end with an operator, otherwise it might strip unwanted content
+ * @param value
+ */
+export function stripOperatorFromFilterValue(value: string) {
+  if (value.lastIndexOf(',') > -1) {
+    return value.substring(0, value.lastIndexOf(','));
+  }
+  return value;
+}
+
+/**
+ * Add an operator to a string
+ * @param value
+ * @param operator
+ */
+export function addOperatorToFilterValue(value: string, operator: string) {
+  if (!value.endsWith(`,${operator}`)) {
+    return `${value},${operator}`;
+  }
+  return value;
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 1d089cf647a..fb88448f7b2 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -2,25 +2,31 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NouisliderModule } from 'ng2-nouislider';
+import { CdkTreeModule } from '@angular/cdk/tree';
+import { DragDropModule } from '@angular/cdk/drag-drop';
 
+import { NouisliderModule } from 'ng2-nouislider';
 import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
-
 import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
-
 import { NgxPaginationModule } from 'ngx-pagination';
-import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
-import { PublicationListElementComponent } from './object-list/item-list-element/item-types/publication/publication-list-element.component';
-
 import { FileUploadModule } from 'ng2-file-upload';
-
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
+import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { TextMaskModule } from 'angular2-text-mask';
+import { MomentModule } from 'ngx-moment';
+import { TooltipModule } from 'ngx-bootstrap';
 
+import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
+import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
+import { ExportMetadataSelectorComponent } from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
+import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
+import { ItemListElementComponent } from './object-list/item-list-element/item-types/item/item-list-element.component';
 import { EnumKeysPipe } from './utils/enum-keys-pipe';
 import { FileSizePipe } from './utils/file-size-pipe';
+import { MetadataFieldValidator } from './utils/metadatafield-validator.directive';
 import { SafeUrlPipe } from './utils/safe-url-pipe';
 import { ConsolePipe } from './utils/console.pipe';
-
 import { CollectionListElementComponent } from './object-list/collection-list-element/collection-list-element.component';
 import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
 import { SearchResultListElementComponent } from './object-list/search-result-list-element/search-result-list-element.component';
@@ -46,16 +52,13 @@ import { VarDirective } from './utils/var.directive';
 import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
 import { LogOutComponent } from './log-out/log-out.component';
 import { FormComponent } from './form/form.component';
-import { DsDynamicTypeaheadComponent } from './form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component';
+import { DsDynamicOneboxComponent } from './form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from './form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import {
   DsDynamicFormControlContainerComponent,
   dsDynamicFormControlMapFn
 } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { DsDynamicFormComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form.component';
-import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { TextMaskModule } from 'angular2-text-mask';
 import { DragClickDirective } from './utils/drag-click.directive';
 import { TruncatePipe } from './utils/truncate.pipe';
 import { TruncatableComponent } from './truncatable/truncatable.component';
@@ -95,13 +98,11 @@ import { EmphasizePipe } from './utils/emphasize.pipe';
 import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
 import { CapitalizePipe } from './utils/capitalize.pipe';
 import { ObjectKeysPipe } from './utils/object-keys-pipe';
-import { MomentModule } from 'ngx-moment';
 import { AuthorityConfidenceStateDirective } from './authority-confidence/authority-confidence-state.directive';
 import { MenuModule } from './menu/menu.module';
 import { LangSwitchComponent } from './lang-switch/lang-switch.component';
 import { PlainTextMetadataListElementComponent } from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
 import { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
-import { TooltipModule } from 'ngx-bootstrap';
 import { MetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
 import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component';
 import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component';
@@ -159,13 +160,12 @@ import { ItemSelectComponent } from './object-select/item-select/item-select.com
 import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
 import { FilterInputSuggestionsComponent } from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
 import { DsoInputSuggestionsComponent } from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
-import { PublicationGridElementComponent } from './object-grid/item-grid-element/item-types/publication/publication-grid-element.component';
-import { ItemTypeBadgeComponent } from './object-list/item-type-badge/item-type-badge.component';
+import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
+import { TypeBadgeComponent } from './object-list/type-badge/type-badge.component';
 import { MetadataRepresentationLoaderComponent } from './metadata-representation/metadata-representation-loader.component';
 import { MetadataRepresentationDirective } from './metadata-representation/metadata-representation.directive';
 import { ListableObjectComponentLoaderComponent } from './object-collection/shared/listable-object/listable-object-component-loader.component';
-import { PublicationSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component';
-import { PublicationSearchResultGridElementComponent } from './object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component';
+import { ItemSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { ListableObjectDirective } from './object-collection/shared/listable-object/listable-object.directive';
 import { SearchLabelComponent } from './search/search-labels/search-label/search-label.component';
 import { ItemMetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
@@ -177,7 +177,6 @@ import { SelectableListItemControlComponent } from './object-collection/shared/s
 import { DsDynamicLookupRelationExternalSourceTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
 import { ExternalSourceEntryImportModalComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { ImportableListItemControlComponent } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
-import { DragDropModule } from '@angular/cdk/drag-drop';
 import { ExistingMetadataListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import { ItemVersionsComponent } from './item/item-versions/item-versions.component';
 import { SortablejsModule } from 'ngx-sortablejs';
@@ -189,11 +188,53 @@ import { CustomSwitchComponent } from './form/builder/ds-dynamic-form-ui/models/
 import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
 import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
+import { FileValidator } from './utils/require-file.validator';
+import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
+import { ExistingRelationListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component';
 import { ModifyItemOverviewComponent } from '../+item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
 import { ClaimedTaskActionsLoaderComponent } from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
 import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
 import { ClaimedTaskActionsEditMetadataComponent } from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
 import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
+import { ResourcePoliciesComponent } from './resource-policies/resource-policies.component';
+import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
+import { ResourcePolicyFormComponent } from './resource-policies/form/resource-policy-form.component';
+import { EpersonGroupListComponent } from './resource-policies/form/eperson-group-list/eperson-group-list.component';
+import { ResourcePolicyTargetResolver } from './resource-policies/resolvers/resource-policy-target.resolver';
+import { ResourcePolicyResolver } from './resource-policies/resolvers/resource-policy.resolver';
+import { EpersonSearchBoxComponent } from './resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component';
+import { GroupSearchBoxComponent } from './resource-policies/form/eperson-group-list/group-search-box/group-search-box.component';
+import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
+import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
+import { DsSelectComponent } from './ds-select/ds-select.component';
+import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component';
+import { CurationFormComponent } from '../curation-form/curation-form.component';
+import { PublicationSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
+import { SidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { CollectionSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component';
+import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
+import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
+import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component';
+import { HoverClassDirective } from './hover-class.directive';
+import { ValidationSuggestionsComponent } from './input-suggestions/validation-suggestions/validation-suggestions.component';
+import { ItemAlertsComponent } from './item/item-alerts/item-alerts.component';
+import { ItemSearchResultGridElementComponent } from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
+import { ResourcePolicyEditComponent } from './resource-policies/edit/resource-policy-edit.component';
+import { ResourcePolicyCreateComponent } from './resource-policies/create/resource-policy-create.component';
+import { SearchObjects } from './search/search-objects.model';
+import { SearchResult } from './search/search-result.model';
+import { FacetConfigResponse } from './search/facet-config-response.model';
+import { FacetValues } from './search/facet-values.model';
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const MODELS = [
+  SearchObjects,
+  FacetConfigResponse,
+  FacetValues,
+  SearchResult
+];
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -215,7 +256,8 @@ const MODULES = [
   MomentModule,
   TextMaskModule,
   MenuModule,
-  DragDropModule
+  DragDropModule,
+  CdkTreeModule
 ];
 
 const ROOT_MODULES = [
@@ -264,12 +306,13 @@ const COMPONENTS = [
   DsDynamicLookupRelationModalComponent,
   DsDynamicScrollableDropdownComponent,
   DsDynamicTagComponent,
-  DsDynamicTypeaheadComponent,
+  DsDynamicOneboxComponent,
   DsDynamicRelationGroupComponent,
   DsDatePickerComponent,
   DsDynamicFormGroupComponent,
   DsDynamicFormArrayComponent,
   DsDatePickerInlineComponent,
+  DsSelectComponent,
   ErrorComponent,
   FormComponent,
   LangSwitchComponent,
@@ -291,6 +334,7 @@ const COMPONENTS = [
   ThumbnailComponent,
   GridThumbnailComponent,
   UploaderComponent,
+  FileDropzoneNoUploaderComponent,
   ItemListPreviewComponent,
   MyDSpaceItemStatusComponent,
   ItemSubmitterComponent,
@@ -312,6 +356,7 @@ const COMPONENTS = [
   BrowseByComponent,
   InputSuggestionsComponent,
   FilterInputSuggestionsComponent,
+  ValidationSuggestionsComponent,
   DsoInputSuggestionsComponent,
   DSOSelectorComponent,
   CreateCommunityParentSelectorComponent,
@@ -355,7 +400,7 @@ const COMPONENTS = [
   BrowseByComponent,
   AbstractTrackableComponent,
   ComcolMetadataComponent,
-  ItemTypeBadgeComponent,
+  TypeBadgeComponent,
   BrowseByComponent,
   AbstractTrackableComponent,
   CustomSwitchComponent,
@@ -366,14 +411,28 @@ const COMPONENTS = [
   ExternalSourceEntryImportModalComponent,
   ImportableListItemControlComponent,
   ExistingMetadataListElementComponent,
+  ExistingRelationListElementComponent,
   LogInShibbolethComponent,
   LogInPasswordComponent,
   LogInContainerComponent,
   ItemVersionsComponent,
-  PublicationSearchResultListElementComponent,
+  ItemSearchResultListElementComponent,
   ItemVersionsNoticeComponent,
   ModifyItemOverviewComponent,
-  ImpersonateNavbarComponent
+  ImpersonateNavbarComponent,
+  ResourcePoliciesComponent,
+  ResourcePolicyFormComponent,
+  ResourcePolicyEditComponent,
+  ResourcePolicyCreateComponent,
+  EpersonGroupListComponent,
+  EpersonSearchBoxComponent,
+  GroupSearchBoxComponent,
+  FileDownloadLinkComponent,
+  CollectionDropdownComponent,
+  ExportMetadataSelectorComponent,
+  ConfirmationModalComponent,
+  VocabularyTreeviewComponent,
+  AuthorizedCollectionSelectorComponent,
 ];
 
 const ENTRY_COMPONENTS = [
@@ -388,10 +447,10 @@ const ENTRY_COMPONENTS = [
   CommunitySearchResultGridElementComponent,
   CollectionSearchResultGridElementComponent,
   SearchResultGridElementComponent,
-  PublicationListElementComponent,
-  PublicationGridElementComponent,
-  PublicationSearchResultListElementComponent,
-  PublicationSearchResultGridElementComponent,
+  ItemListElementComponent,
+  ItemGridElementComponent,
+  ItemSearchResultListElementComponent,
+  ItemSearchResultGridElementComponent,
   BrowseEntryListElementComponent,
   SearchResultDetailElementComponent,
   SearchResultGridElementComponent,
@@ -401,7 +460,7 @@ const ENTRY_COMPONENTS = [
   DsDynamicLookupRelationModalComponent,
   DsDynamicScrollableDropdownComponent,
   DsDynamicTagComponent,
-  DsDynamicTypeaheadComponent,
+  DsDynamicOneboxComponent,
   DsDynamicRelationGroupComponent,
   DsDatePickerComponent,
   DsDynamicFormGroupComponent,
@@ -438,6 +497,7 @@ const ENTRY_COMPONENTS = [
   DsDynamicLookupRelationSelectionTabComponent,
   DsDynamicLookupRelationExternalSourceTabComponent,
   ExternalSourceEntryImportModalComponent,
+  ExistingRelationListElementComponent,
   LogInPasswordComponent,
   LogInShibbolethComponent,
   ItemVersionsComponent,
@@ -446,12 +506,25 @@ const ENTRY_COMPONENTS = [
   ClaimedTaskActionsApproveComponent,
   ClaimedTaskActionsRejectComponent,
   ClaimedTaskActionsReturnToPoolComponent,
-  ClaimedTaskActionsEditMetadataComponent
+  ClaimedTaskActionsEditMetadataComponent,
+  CollectionDropdownComponent,
+  FileDownloadLinkComponent,
+  CurationFormComponent,
+  ExportMetadataSelectorComponent,
+  ConfirmationModalComponent,
+  VocabularyTreeviewComponent,
+  SidebarSearchListElementComponent,
+  PublicationSidebarSearchListElementComponent,
+  CollectionSidebarSearchListElementComponent,
+  CommunitySidebarSearchListElementComponent,
+  AuthorizedCollectionSelectorComponent,
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [
   MetadataFieldWrapperComponent,
   MetadataValuesComponent,
+  DsoPageEditButtonComponent,
+  ItemAlertsComponent,
 ];
 
 const PROVIDERS = [
@@ -461,7 +534,9 @@ const PROVIDERS = [
   {
     provide: DYNAMIC_FORM_CONTROL_MAP_FN,
     useValue: dsDynamicFormControlMapFn
-  }
+  },
+  ResourcePolicyResolver,
+  ResourcePolicyTargetResolver
 ];
 
 const DIRECTIVES = [
@@ -475,7 +550,13 @@ const DIRECTIVES = [
   RoleDirective,
   MetadataRepresentationDirective,
   ListableObjectDirective,
-  ClaimedTaskActionsDirective
+  ClaimedTaskActionsDirective,
+  FileValueAccessorDirective,
+  FileValidator,
+  ClaimedTaskActionsDirective,
+  NgForTrackByIdDirective,
+  MetadataFieldValidator,
+  HoverClassDirective
 ];
 
 @NgModule({
@@ -489,18 +570,18 @@ const DIRECTIVES = [
     ...DIRECTIVES,
     ...ENTRY_COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS,
-
   ],
   providers: [
     ...PROVIDERS
   ],
-  exports: [
-    ...MODULES,
-    ...PIPES,
-    ...COMPONENTS,
-    ...SHARED_ITEM_PAGE_COMPONENTS,
-    ...DIRECTIVES
-  ],
+    exports: [
+        ...MODULES,
+        ...PIPES,
+        ...COMPONENTS,
+        ...SHARED_ITEM_PAGE_COMPONENTS,
+        ...DIRECTIVES,
+        CurationFormComponent
+    ],
   entryComponents: [
     ...ENTRY_COMPONENTS
   ]
diff --git a/src/app/shared/testing/auth-request-service.stub.ts b/src/app/shared/testing/auth-request-service.stub.ts
index 1dc04380df7..cbb5d31ef6c 100644
--- a/src/app/shared/testing/auth-request-service.stub.ts
+++ b/src/app/shared/testing/auth-request-service.stub.ts
@@ -1,14 +1,16 @@
 import { Observable, of as observableOf } from 'rxjs';
-import { HttpOptions } from '../../core/dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../../core/dspace-rest/dspace-rest.service';
 import { AuthStatus } from '../../core/auth/models/auth-status.model';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { isNotEmpty } from '../empty.util';
 import { EPersonMock } from './eperson.mock';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 export class AuthRequestServiceStub {
   protected mockUser: EPerson = EPersonMock;
   protected mockTokenInfo = new AuthTokenInfo('test_token');
+  protected mockShortLivedToken = 'test-shortlived-token';
 
   public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable<any> {
     const authStatusStub: AuthStatus = new AuthStatus();
@@ -40,7 +42,7 @@ export class AuthRequestServiceStub {
     } else {
       authStatusStub.authenticated = false;
     }
-    return observableOf(authStatusStub);
+    return createSuccessfulRemoteDataObject$(authStatusStub);
   }
 
   public getRequest(method: string, options?: HttpOptions): Observable<any> {
@@ -67,7 +69,7 @@ export class AuthRequestServiceStub {
         }
         break;
     }
-    return observableOf(authStatusStub);
+    return createSuccessfulRemoteDataObject$(authStatusStub);
   }
 
   private validateToken(token): boolean {
@@ -82,4 +84,8 @@ export class AuthRequestServiceStub {
     }
     return obj;
   }
+
+  public getShortlivedToken() {
+    return observableOf(this.mockShortLivedToken);
+  }
 }
diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts
index 31143bc8562..f522ce83063 100644
--- a/src/app/shared/testing/auth-service.stub.ts
+++ b/src/app/shared/testing/auth-service.stub.ts
@@ -150,4 +150,20 @@ export class AuthServiceStub {
   getImpersonateID() {
     return this.impersonating;
   }
+
+  resetAuthenticationError() {
+    return;
+  }
+
+  setRedirectUrlIfNotSet(url: string) {
+    return;
+  }
+
+  redirectAfterLoginSuccess() {
+    return;
+  }
+
+  clearRedirectUrl() {
+    return;
+  }
 }
diff --git a/src/app/shared/testing/authority-service.stub.ts b/src/app/shared/testing/authority-service.stub.ts
deleted file mode 100644
index 3a5d31ab0d7..00000000000
--- a/src/app/shared/testing/authority-service.stub.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {of as observableOf,  Observable } from 'rxjs';
-import { IntegrationSearchOptions } from '../../core/integration/models/integration-options.model';
-import { IntegrationData } from '../../core/integration/integration-data';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { AuthorityValue } from '../../core/integration/models/authority.value';
-
-export class AuthorityServiceStub {
-
-  private _payload = [
-    Object.assign(new AuthorityValue(),{id: 1, display: 'one', value: 1}),
-    Object.assign(new AuthorityValue(),{id: 2, display: 'two', value: 2}),
-  ];
-
-  setNewPayload(payload) {
-    this._payload = payload;
-  }
-
-  getEntriesByName(options: IntegrationSearchOptions) {
-    return observableOf(new IntegrationData(new PageInfo(), this._payload));
-  }
-}
diff --git a/src/app/shared/testing/group-mock.ts b/src/app/shared/testing/group-mock.ts
index 04395ae8fa5..24a78a58e5b 100644
--- a/src/app/shared/testing/group-mock.ts
+++ b/src/app/shared/testing/group-mock.ts
@@ -12,8 +12,10 @@ export const GroupMock2: Group = Object.assign(new Group(), {
             href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2',
         },
         subgroups: { href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/subgroups' },
+        object: { href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/object' },
         epersons: { href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/epersons' }
     },
+    _name: 'testgroupname2',
     id: 'testgroupid2',
     uuid: 'testgroupid2',
     type: 'group',
@@ -30,8 +32,10 @@ export const GroupMock: Group = Object.assign(new Group(), {
             href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid',
         },
         subgroups: { href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/subgroups' },
+        object: { href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/object' },
         epersons: { href: 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/epersons' }
     },
+    _name: 'testgroupname',
     id: 'testgroupid',
     uuid: 'testgroupid',
     type: 'group',
diff --git a/src/app/shared/testing/menu-service.stub.ts b/src/app/shared/testing/menu-service.stub.ts
index de71e3483d6..0246aa39d1c 100644
--- a/src/app/shared/testing/menu-service.stub.ts
+++ b/src/app/shared/testing/menu-service.stub.ts
@@ -59,6 +59,9 @@ export class MenuServiceStub {
   removeSection(): void { /***/
   };
 
+  resetSections(): void { /***/
+  };
+
   isMenuVisible(id: MenuID): Observable<boolean> {
     return observableOf(true)
   };
diff --git a/src/app/shared/testing/sections-service.stub.ts b/src/app/shared/testing/sections-service.stub.ts
index 2110d71d8e8..3b311c5e19b 100644
--- a/src/app/shared/testing/sections-service.stub.ts
+++ b/src/app/shared/testing/sections-service.stub.ts
@@ -2,6 +2,7 @@ export class SectionsServiceStub {
 
   checkSectionErrors = jasmine.createSpy('checkSectionErrors');
   dispatchRemoveSectionErrors = jasmine.createSpy('dispatchRemoveSectionErrors');
+  dispatchSetSectionFormId = jasmine.createSpy('dispatchSetSectionFormId');
   getSectionData = jasmine.createSpy('getSectionData');
   getSectionErrors = jasmine.createSpy('getSectionErrors');
   getSectionState = jasmine.createSpy('getSectionState');
@@ -14,5 +15,5 @@ export class SectionsServiceStub {
   updateSectionData = jasmine.createSpy('updateSectionData');
   setSectionError = jasmine.createSpy('setSectionError');
   setSectionStatus = jasmine.createSpy('setSectionStatus');
-
+  computeSectionConfiguredMetadata = jasmine.createSpy('computeSectionConfiguredMetadata');
 }
diff --git a/src/app/shared/testing/submission-service.stub.ts b/src/app/shared/testing/submission-service.stub.ts
index a330fa3eeec..d9d28bde0ee 100644
--- a/src/app/shared/testing/submission-service.stub.ts
+++ b/src/app/shared/testing/submission-service.stub.ts
@@ -2,6 +2,7 @@ export class SubmissionServiceStub {
 
   changeSubmissionCollection = jasmine.createSpy('changeSubmissionCollection');
   createSubmission = jasmine.createSpy('createSubmission');
+  createSubmissionFromExternalSource = jasmine.createSpy('createSubmissionFromExternalSource');
   depositSubmission = jasmine.createSpy('depositSubmission');
   discardSubmission = jasmine.createSpy('discardSubmission');
   dispatchInit = jasmine.createSpy('dispatchInit');
@@ -19,6 +20,7 @@ export class SubmissionServiceStub {
   getSubmissionStatus = jasmine.createSpy('getSubmissionStatus');
   getSubmissionSaveProcessingStatus = jasmine.createSpy('getSubmissionSaveProcessingStatus');
   getSubmissionDepositProcessingStatus = jasmine.createSpy('getSubmissionDepositProcessingStatus');
+  hasUnsavedModification = jasmine.createSpy('hasUnsavedModification');
   isSectionHidden = jasmine.createSpy('isSectionHidden');
   isSubmissionLoading = jasmine.createSpy('isSubmissionLoading');
   notifyNewSection = jasmine.createSpy('notifyNewSection');
diff --git a/src/app/shared/testing/test-module.ts b/src/app/shared/testing/test-module.ts
index b2129435da5..6721e3042b0 100644
--- a/src/app/shared/testing/test-module.ts
+++ b/src/app/shared/testing/test-module.ts
@@ -22,7 +22,11 @@ import { RouterLinkDirectiveStub } from './router-link-directive.stub';
     MySimpleItemActionComponent,
     RouterLinkDirectiveStub,
     NgComponentOutletDirectiveStub
-  ], schemas: [
+  ],
+  exports: [
+    QueryParamsDirectiveStub
+  ],
+  schemas: [
     CUSTOM_ELEMENTS_SCHEMA
   ]
 })
diff --git a/src/app/shared/testing/utils.test.ts b/src/app/shared/testing/utils.test.ts
index 72abbe2b047..ccfe0ca7b43 100644
--- a/src/app/shared/testing/utils.test.ts
+++ b/src/app/shared/testing/utils.test.ts
@@ -1,6 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PaginatedList } from '../../core/data/paginated-list';
+import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { RequestEntry, RequestEntryState } from '../../core/data/request.reducer';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { UnCacheableObject } from '../../core/shared/uncacheable-object.model';
 
 /**
  * Returns true if a Native Element has a specified css class.
@@ -58,7 +62,7 @@ export function spyOnOperator(obj: any, prop: string): any {
  * @param objects An array representing the paginated list's page
  */
 export function createPaginatedList<T>(objects?: T[]): PaginatedList<T> {
-  return new PaginatedList(new PageInfo(), objects);
+  return buildPaginatedList(new PageInfo(), objects);
 }
 
 /**
@@ -71,3 +75,23 @@ export function spyOnExported<T>(target: T, prop: keyof T): jasmine.Spy {
   spyOnProperty(target, prop).and.returnValue(spy);
   return spy;
 }
+
+/**
+ * Create a mock request entry to be used in testing
+ * @param unCacheableObject
+ * @param statusCode
+ * @param errorMessage
+ */
+export function createRequestEntry$(unCacheableObject?: UnCacheableObject, statusCode = 200, errorMessage?: string): Observable<RequestEntry> {
+  return observableOf({
+    request: undefined,
+    state: RequestEntryState.Success,
+    response: {
+      timeCompleted: new Date().getTime(),
+      statusCode,
+      errorMessage,
+      unCacheableObject
+    },
+    lastUpdated: new Date().getTime()
+  });
+}
diff --git a/src/app/shared/testing/vocabulary-service.stub.ts b/src/app/shared/testing/vocabulary-service.stub.ts
new file mode 100644
index 00000000000..ff6daeabc9e
--- /dev/null
+++ b/src/app/shared/testing/vocabulary-service.stub.ts
@@ -0,0 +1,45 @@
+import { Observable, of as observableOf } from 'rxjs';
+
+import { PageInfo } from '../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { RemoteData } from '../../core/data/remote-data';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { Vocabulary } from '../../core/submission/vocabularies/models/vocabulary.model';
+
+export class VocabularyServiceStub {
+
+  private _payload = [
+    Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 }),
+    Object.assign(new VocabularyEntry(), { authority: 2, display: 'two', value: 2 }),
+  ];
+
+  setNewPayload(payload) {
+    this._payload = payload;
+  }
+
+  getList() {
+    return this._payload
+  }
+
+  getVocabularyEntries(vocabularyOptions: VocabularyOptions, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<VocabularyEntry>>> {
+    return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this._payload));
+  }
+
+  getVocabularyEntriesByValue(value: string, exact: boolean, vocabularyOptions: VocabularyOptions, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<VocabularyEntry>>> {
+    return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this._payload));
+  }
+
+  getVocabularyEntryByValue(value: string, vocabularyOptions: VocabularyOptions): Observable<VocabularyEntry> {
+    return observableOf(Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 }));
+  }
+
+  getVocabularyEntryByID(id: string, vocabularyOptions: VocabularyOptions): Observable<VocabularyEntry> {
+    return observableOf(Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 }));
+  }
+
+  findVocabularyById(id: string): Observable<RemoteData<Vocabulary>> {
+    return;
+  }
+}
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index 72f41cd770b..bf1212a6bf6 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -1,5 +1,5 @@
-<div class="clamp-{{lines}} min-{{minLines}} {{type}} {{fixedHeight ? 'fixedHeight' : ''}}">
+<div class="clamp-{{background}}-{{lines}} min-{{minLines}} {{type}} {{fixedHeight ? 'fixedHeight' : ''}}">
     <div class="content">
         <ng-content></ng-content>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss
index 68b6772465a..d2ddfc73834 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss
@@ -1,4 +1,4 @@
-@mixin clamp($lines, $size-factor: 1, $line-height: $line-height-base) {
+@mixin clamp($lines, $bg, $size-factor: 1, $line-height: $line-height-base) {
     $height: $line-height * $font-size-base * $size-factor;
     &.fixedHeight {
         height: $lines * $height;
@@ -19,10 +19,11 @@
             min-width: 75px;
             max-width: 150px;
             height: $height;
-            background: linear-gradient(to right, rgba(255, 255, 255, 0), $body-bg 70%);
+            background: linear-gradient(to right, rgba(255, 255, 255, 0), $bg 70%);
             pointer-events: none;
         }
     }
+
 }
 
 @mixin min($lines, $size-factor: 1, $line-height: $line-height-base) {
@@ -31,16 +32,32 @@
 }
 
 $h4-factor: strip-unit($h4-font-size);
+
+@mixin clamp-with-titles($i, $bg) {
+  transition: height 1s;
+  @include clamp($i, $bg);
+  &.title {
+    @include clamp($i, $bg, 1.25);
+  }
+  &.h4 {
+    @include clamp($i, $bg, $h4-factor, $headings-line-height);
+  }
+}
+
 @for $i from 1 through 15 {
-    .clamp-#{$i} {
-        transition: height 1s;
-        @include clamp($i);
-        &.title {
-            @include clamp($i, 1.25);
-        }
-        &.h4 {
-            @include clamp($i, $h4-factor, $headings-line-height);
-        }
+    .clamp-default-#{$i} {
+        @include clamp-with-titles($i, $body-bg);
+    }
+    :host-context(.ds-hover) .clamp-default-#{$i} {
+        @include clamp-with-titles($i, $list-group-hover-bg);
+    }
+
+    .clamp-primary-#{$i} {
+      @include clamp-with-titles($i, $primary);
+    }
+
+    :host-context(.ds-hover) .clamp-primary-#{$i} {
+      @include clamp-with-titles($i, darken($primary, 10%));
     }
 }
 
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index fef5d7d098d..2a375e95d99 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -38,6 +38,8 @@ export class TruncatablePartComponent implements OnInit, OnDestroy {
    */
   @Input() fixedHeight = false;
 
+  @Input() background = 'default';
+
   /**
    * Current amount of lines shown of this part
    */
diff --git a/src/app/shared/uploader/uploader-error.model.ts b/src/app/shared/uploader/uploader-error.model.ts
new file mode 100644
index 00000000000..9238a0df367
--- /dev/null
+++ b/src/app/shared/uploader/uploader-error.model.ts
@@ -0,0 +1,9 @@
+/**
+ * An interface that represents the upload error values
+ */
+export interface UploaderError {
+  item?: any;
+  response?: any;
+  status?: any;
+  headers?: any;
+}
diff --git a/src/app/shared/uploader/uploader-options.model.ts b/src/app/shared/uploader/uploader-options.model.ts
index f195b0930e5..959e5c32959 100644
--- a/src/app/shared/uploader/uploader-options.model.ts
+++ b/src/app/shared/uploader/uploader-options.model.ts
@@ -17,6 +17,11 @@ export class UploaderOptions {
    */
   autoUpload = true;
 
+  /**
+   * Set the max number of files that can be loaded
+   */
+  maxFileNumber: number;
+
   /**
    * The request method to use for the file upload request
    */
diff --git a/src/app/shared/uploader/uploader.component.ts b/src/app/shared/uploader/uploader.component.ts
index 72a38d1eb15..07f4245954b 100644
--- a/src/app/shared/uploader/uploader.component.ts
+++ b/src/app/shared/uploader/uploader.component.ts
@@ -69,6 +69,11 @@ export class UploaderComponent {
    */
   @Output() onUploadError: EventEmitter<any> = new EventEmitter<any>();
 
+  /**
+   * The function to call when a file is selected
+   */
+  @Output() onFileSelected: EventEmitter<any> = new EventEmitter<any>();
+
   public uploader: FileUploader;
   public uploaderId: string;
   public isOverBaseDropZone = observableOf(false);
@@ -102,7 +107,8 @@ export class UploaderComponent {
       itemAlias: this.uploadFilesOptions.itemAlias,
       removeAfterUpload: true,
       autoUpload: this.uploadFilesOptions.autoUpload,
-      method: this.uploadFilesOptions.method
+      method: this.uploadFilesOptions.method,
+      queueLimit: this.uploadFilesOptions.maxFileNumber
     });
 
     if (isUndefined(this.enableDragOverDocument)) {
@@ -121,6 +127,9 @@ export class UploaderComponent {
     this.uploader.onAfterAddingFile = ((item) => {
       item.withCredentials = false;
     });
+    this.uploader.onAfterAddingAll = ((items) => {
+      this.onFileSelected.emit(items);
+    });
     if (isUndefined(this.onBeforeUpload)) {
       this.onBeforeUpload = () => {return};
     }
@@ -149,7 +158,7 @@ export class UploaderComponent {
       }
     };
     this.uploader.onErrorItem = (item: any, response: any, status: any, headers: any) => {
-      this.onUploadError.emit(null);
+      this.onUploadError.emit({ item: item, response: response, status: status, headers: headers });
       this.uploader.cancelAll();
     };
     this.uploader.onProgressAll = () => this.onProgress();
diff --git a/src/app/shared/utils/file-size-pipe.ts b/src/app/shared/utils/file-size-pipe.ts
index a796edb0738..2d219cdaf43 100644
--- a/src/app/shared/utils/file-size-pipe.ts
+++ b/src/app/shared/utils/file-size-pipe.ts
@@ -1,4 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
+import * as fileSize from 'filesize';
 
 /*
  * Convert bytes into largest possible unit.
@@ -12,30 +13,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({ name: 'dsFileSize' })
 export class FileSizePipe implements PipeTransform {
-
-  private units: string[] = [
-    'bytes',
-    'KiB',
-    'MiB',
-    'GiB',
-    'TiB',
-    'PiB'
-  ];
-
   transform(bytes: number = 0, precision: number = 2): string {
-    let result: string;
-    if (isNaN(parseFloat(String(bytes))) || !isFinite(bytes)) {
-      result = '?';
-    } else {
-      let unit = 0;
-
-      while (bytes >= 1024) {
-        bytes /= 1024;
-        unit++;
-      }
-
-      result = bytes.toFixed(+ precision) + ' ' + this.units[unit];
-    }
-    return result;
+    return fileSize(bytes, { standard: 'jedec', round: precision });
   }
 }
diff --git a/src/app/shared/utils/file-value-accessor.directive.ts b/src/app/shared/utils/file-value-accessor.directive.ts
new file mode 100644
index 00000000000..bcd33813293
--- /dev/null
+++ b/src/app/shared/utils/file-value-accessor.directive.ts
@@ -0,0 +1,27 @@
+import {Directive} from '@angular/core';
+import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
+
+@Directive({
+    // tslint:disable-next-line:directive-selector
+    selector: 'input[type=file]',
+    // tslint:disable-next-line:no-host-metadata-property
+    host : {
+        '(change)' : 'onChange($event.target.files)',
+        '(blur)': 'onTouched()'
+    },
+    providers: [
+        { provide: NG_VALUE_ACCESSOR, useExisting: FileValueAccessorDirective, multi: true }
+    ]
+})
+/**
+ * Value accessor directive for inputs of type 'file'
+ */
+export class FileValueAccessorDirective implements ControlValueAccessor {
+    value: any;
+    onChange = (_) => { /* empty */ };
+    onTouched = () => { /* empty */};
+
+    writeValue(value) { /* empty */}
+    registerOnChange(fn: any) { this.onChange = fn; }
+    registerOnTouched(fn: any) { this.onTouched = fn; }
+}
diff --git a/src/app/shared/utils/metadatafield-validator.directive.ts b/src/app/shared/utils/metadatafield-validator.directive.ts
new file mode 100644
index 00000000000..8725246eebe
--- /dev/null
+++ b/src/app/shared/utils/metadatafield-validator.directive.ts
@@ -0,0 +1,62 @@
+import { Directive, Injectable } from '@angular/core';
+import { AbstractControl, AsyncValidator, NG_VALIDATORS, ValidationErrors } from '@angular/forms';
+import { map, switchMap, take } from 'rxjs/operators';
+import { of as observableOf, timer as observableTimer, Observable } from 'rxjs';
+import { MetadataFieldDataService } from '../../core/data/metadata-field-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { MetadataField } from '../../core/metadata/metadata-field.model';
+import { getFirstSucceededRemoteData } from '../../core/shared/operators';
+
+/**
+ * Directive for validating if a ngModel value is a valid metadata field
+ */
+@Directive({
+  selector: '[ngModel][dsMetadataFieldValidator]',
+  // We add our directive to the list of existing validators
+  providers: [
+    { provide: NG_VALIDATORS, useExisting: MetadataFieldValidator, multi: true }
+  ]
+})
+@Injectable({ providedIn: 'root' })
+export class MetadataFieldValidator implements AsyncValidator {
+
+  constructor(private metadataFieldService: MetadataFieldDataService) {
+  }
+
+  /**
+   * The function that checks if the form control's value is currently valid
+   * @param control The FormControl
+   */
+  validate(control: AbstractControl): Promise<ValidationErrors | null> | Observable<ValidationErrors | null> {
+    const resTimer = observableTimer(500).pipe(
+      switchMap(() => {
+        if (!control.value) {
+          return observableOf({ invalidMetadataField: { value: control.value } });
+        }
+        const mdFieldNameParts = control.value.split('.');
+        if (mdFieldNameParts.length < 2) {
+          return observableOf({ invalidMetadataField: { value: control.value } });
+        }
+
+        const res = this.metadataFieldService.findByExactFieldName(control.value)
+          .pipe(
+            getFirstSucceededRemoteData(),
+            map((matchingFieldRD: RemoteData<PaginatedList<MetadataField>>) => {
+              if (matchingFieldRD.payload.pageInfo.totalElements === 0) {
+                return { invalidMetadataField: { value: control.value } };
+              } else if (matchingFieldRD.payload.pageInfo.totalElements === 1) {
+                return null;
+              }
+            })
+          );
+
+        res.pipe(take(1)).subscribe();
+
+        return res;
+      })
+    );
+    resTimer.pipe(take(1)).subscribe();
+    return resTimer;
+  }
+}
diff --git a/src/app/shared/utils/relation-query.utils.spec.ts b/src/app/shared/utils/relation-query.utils.spec.ts
index f70e9044228..f40c3314974 100644
--- a/src/app/shared/utils/relation-query.utils.spec.ts
+++ b/src/app/shared/utils/relation-query.utils.spec.ts
@@ -6,13 +6,13 @@ describe('Relation Query Utils', () => {
   describe('getQueryByRelations', () => {
     it('Should return the correct query based on relationtype and uuid', () => {
       const result = getQueryByRelations(relationtype, itemUUID);
-      expect(result).toEqual('query=relation.isAuthorOfPublication:a7939af0-36ad-430d-af09-7be8b0a4dadd');
+      expect(result).toEqual('query=relation.isAuthorOfPublication:"a7939af0-36ad-430d-af09-7be8b0a4dadd"');
     });
   });
   describe('getFilterByRelation', () => {
     it('Should return the correct query based on relationtype and uuid', () => {
       const result = getFilterByRelation(relationtype, itemUUID);
-      expect(result).toEqual('f.isAuthorOfPublication=a7939af0-36ad-430d-af09-7be8b0a4dadd');
+      expect(result).toEqual('f.isAuthorOfPublication=a7939af0-36ad-430d-af09-7be8b0a4dadd,equals');
     });
   });
 });
diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts
index 74f9e64cc9e..13248c5a6b4 100644
--- a/src/app/shared/utils/relation-query.utils.ts
+++ b/src/app/shared/utils/relation-query.utils.ts
@@ -5,7 +5,7 @@
  * @returns {string}              Query
  */
 export function getQueryByRelations(relationType: string, itemUUID: string): string {
-  return `query=relation.${relationType}:${itemUUID}`;
+  return `query=relation.${relationType}:"${itemUUID}"`;
 }
 
 /**
@@ -14,5 +14,5 @@ export function getQueryByRelations(relationType: string, itemUUID: string): str
  * @param itemUUID        The item's UUID
  */
 export function getFilterByRelation(relationType: string, itemUUID: string): string {
-  return `f.${relationType}=${itemUUID}`;
+  return `f.${relationType}=${itemUUID},equals`;
 }
diff --git a/src/app/shared/utils/require-file.validator.ts b/src/app/shared/utils/require-file.validator.ts
new file mode 100644
index 00000000000..9fa89c4188d
--- /dev/null
+++ b/src/app/shared/utils/require-file.validator.ts
@@ -0,0 +1,22 @@
+import {Directive} from '@angular/core';
+import {NG_VALIDATORS, Validator, FormControl} from '@angular/forms';
+
+@Directive({
+  // tslint:disable-next-line:directive-selector
+    selector: '[requireFile]',
+    providers: [
+        { provide: NG_VALIDATORS, useExisting: FileValidator, multi: true },
+    ]
+})
+/**
+ * Validator directive to validate if a file is selected
+ */
+export class FileValidator implements Validator {
+    static validate(c: FormControl): {[key: string]: any} {
+      return c.value == null || c.value.length === 0 ? { required : true } : null;
+    }
+
+    validate(c: FormControl): {[key: string]: any} {
+      return FileValidator.validate(c);
+    }
+}
diff --git a/src/app/shared/utils/route.utils.ts b/src/app/shared/utils/route.utils.ts
index 6510fb88940..f43204930d8 100644
--- a/src/app/shared/utils/route.utils.ts
+++ b/src/app/shared/utils/route.utils.ts
@@ -1,4 +1,6 @@
-import { Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { hasValue } from '../empty.util';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
 
 /**
  * Util function to retrieve the current path (without query parameters) the user is on
@@ -8,3 +10,11 @@ export function currentPath(router: Router) {
   const urlTree = router.parseUrl(router.url);
   return '/' + urlTree.root.children.primary.segments.map((it) => it.path).join('/')
 }
+
+export function currentPathFromSnapshot(route: ActivatedRouteSnapshot): string {
+  if (hasValue(route.parent)) {
+    const parentRoute: string = currentPathFromSnapshot(route.parent);
+    return new URLCombiner(parentRoute, route.routeConfig.path).toString();
+  }
+  return route.routeConfig ? route.routeConfig.path : '';
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts b/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
new file mode 100644
index 00000000000..2340d477b6d
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
@@ -0,0 +1,51 @@
+import { CollectionViewer, DataSource } from '@angular/cdk/collections';
+import { FlatTreeControl } from '@angular/cdk/tree';
+
+import { BehaviorSubject, merge, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
+
+/**
+ * Data source for flat tree.
+ * The data source need to handle expansion/collapsion of the tree node and change the data feed
+ * to `MatTree`.
+ * The nested tree nodes of type `T` are flattened through `MatTreeFlattener`, and converted
+ * to type `F` for `MatTree` to consume.
+ */
+export class VocabularyTreeFlatDataSource<T, F> extends DataSource<F> {
+  _flattenedData = new BehaviorSubject<F[]>([]);
+
+  _expandedData = new BehaviorSubject<F[]>([]);
+
+  _data: BehaviorSubject<T[]>;
+  get data() { return this._data.value; }
+  set data(value: T[]) {
+    this._data.next(value);
+    this._flattenedData.next(this._treeFlattener.flattenNodes(this.data));
+    this._treeControl.dataNodes = this._flattenedData.value;
+  }
+
+  constructor(private _treeControl: FlatTreeControl<F>,
+              private _treeFlattener: VocabularyTreeFlattener<T, F>,
+              initialData: T[] = []) {
+    super();
+    this._data = new BehaviorSubject<T[]>(initialData);
+  }
+
+  connect(collectionViewer: CollectionViewer): Observable<F[]> {
+    const changes = [
+      collectionViewer.viewChange,
+      this._treeControl.expansionModel.onChange,
+      this._flattenedData
+    ];
+    return merge(...changes).pipe(map(() => {
+      this._expandedData.next(
+        this._treeFlattener.expandFlattenedNodes(this._flattenedData.value, this._treeControl));
+      return this._expandedData.value;
+    }));
+  }
+
+  disconnect() {
+    // no op
+  }
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-tree-flattener.ts b/src/app/shared/vocabulary-treeview/vocabulary-tree-flattener.ts
new file mode 100644
index 00000000000..419f48d2227
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-tree-flattener.ts
@@ -0,0 +1,111 @@
+import { TreeControl } from '@angular/cdk/tree';
+
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+/**
+ * Tree flattener to convert a normal type of node to node with children & level information.
+ * Transform nested nodes of type `T` to flattened nodes of type `F`.
+ *
+ * For example, the input data of type `T` is nested, and contains its children data:
+ *   SomeNode: {
+ *     key: 'Fruits',
+ *     children: [
+ *       NodeOne: {
+ *         key: 'Apple',
+ *       },
+ *       NodeTwo: {
+ *        key: 'Pear',
+ *      }
+ *    ]
+ *  }
+ *  After flattener flatten the tree, the structure will become
+ *  SomeNode: {
+ *    key: 'Fruits',
+ *    expandable: true,
+ *    level: 1
+ *  },
+ *  NodeOne: {
+ *    key: 'Apple',
+ *    expandable: false,
+ *    level: 2
+ *  },
+ *  NodeTwo: {
+ *   key: 'Pear',
+ *   expandable: false,
+ *   level: 2
+ * }
+ * and the output flattened type is `F` with additional information.
+ */
+export class VocabularyTreeFlattener<T, F> {
+
+  constructor(public transformFunction: (node: T, level: number) => F,
+              public getLevel: (node: F) => number,
+              public isExpandable: (node: F) => boolean,
+              public getChildren: (node: T) =>
+                Observable<T[]> | T[] | undefined | null) {}
+
+  _flattenNode(node: T, level: number,
+               resultNodes: F[], parentMap: boolean[]): F[] {
+    const flatNode = this.transformFunction(node, level);
+    resultNodes.push(flatNode);
+
+    if (this.isExpandable(flatNode)) {
+      const childrenNodes = this.getChildren(node);
+      if (childrenNodes) {
+        if (Array.isArray(childrenNodes)) {
+          this._flattenChildren(childrenNodes, level, resultNodes, parentMap);
+        } else {
+          childrenNodes.pipe(take(1)).subscribe((children) => {
+            this._flattenChildren(children, level, resultNodes, parentMap);
+          });
+        }
+      }
+    }
+    return resultNodes;
+  }
+
+  _flattenChildren(children: T[], level: number,
+                   resultNodes: F[], parentMap: boolean[]): void {
+    children.forEach((child, index) => {
+      const childParentMap: boolean[] = parentMap.slice();
+      childParentMap.push(index !== children.length - 1);
+      this._flattenNode(child, level + 1, resultNodes, childParentMap);
+    });
+  }
+
+  /**
+   * Flatten a list of node type T to flattened version of node F.
+   * Please note that type T may be nested, and the length of `structuredData` may be different
+   * from that of returned list `F[]`.
+   */
+  flattenNodes(structuredData: T[]): F[] {
+    const resultNodes: F[] = [];
+    structuredData.forEach((node) => this._flattenNode(node, 0, resultNodes, []));
+    return resultNodes;
+  }
+
+  /**
+   * Expand flattened node with current expansion status.
+   * The returned list may have different length.
+   */
+  expandFlattenedNodes(nodes: F[], treeControl: TreeControl<F>): F[] {
+    const results: F[] = [];
+    const currentExpand: boolean[] = [];
+    currentExpand[0] = true;
+
+    nodes.forEach((node) => {
+      let expand = true;
+      for (let i = 0; i <= this.getLevel(node); i++) {
+        expand = expand && currentExpand[i];
+      }
+      if (expand) {
+        results.push(node);
+      }
+      if (this.isExpandable(node)) {
+        currentExpand[this.getLevel(node) + 1] = treeControl.isExpanded(node);
+      }
+    });
+    return results;
+  }
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview-node.model.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview-node.model.ts
new file mode 100644
index 00000000000..2ed21cbdf0b
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview-node.model.ts
@@ -0,0 +1,45 @@
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+
+export const LOAD_MORE = 'LOAD_MORE';
+export const LOAD_MORE_ROOT = 'LOAD_MORE_ROOT';
+export const LOAD_MORE_NODE: any = { id: LOAD_MORE };
+export const LOAD_MORE_ROOT_NODE: any = { id: LOAD_MORE_ROOT };
+
+/* tslint:disable:max-classes-per-file */
+/** Nested node */
+export class TreeviewNode {
+  childrenChange = new BehaviorSubject<TreeviewNode[]>([]);
+
+  get children(): TreeviewNode[] {
+    return this.childrenChange.value;
+  }
+
+  constructor(public item: VocabularyEntryDetail,
+              public hasChildren = false,
+              public pageInfo: PageInfo = new PageInfo(),
+              public loadMoreParentItem: VocabularyEntryDetail | null = null,
+              public isSearchNode = false,
+              public isInInitValueHierarchy = false) {
+  }
+
+  updatePageInfo(pageInfo: PageInfo) {
+    this.pageInfo = pageInfo
+  }
+}
+
+/** Flat node with expandable and level information */
+export class TreeviewFlatNode {
+  constructor(public item: VocabularyEntryDetail,
+              public level = 1,
+              public expandable = false,
+              public childrenLoaded = false,
+              public pageInfo: PageInfo = new PageInfo(),
+              public loadMoreParentItem: VocabularyEntryDetail | null = null,
+              public isSearchNode = false,
+              public isInInitValueHierarchy = false) {
+  }
+}
+
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html
new file mode 100644
index 00000000000..3f57e6a4c34
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html
@@ -0,0 +1,77 @@
+<div class="modal-header">
+  <h4 class="modal-title">{{'vocabulary-treeview.header' | translate}}</h4>
+  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <div class="p-3">
+    <ds-alert *ngIf="description | async" [content]="description | async" [type]="'alert-info'"></ds-alert>
+    <div class="treeview-header row">
+      <div class="col-12">
+        <div class="input-group">
+          <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
+          <div class="input-group-append" id="button-addon4">
+            <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+              {{'vocabulary-treeview.search.form.search' | translate}}
+            </button>
+            <button class="btn btn-outline-secondary" type="button" (click)="reset()">
+              {{'vocabulary-treeview.search.form.reset' | translate}}
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="treeview-container">
+      <ds-loading *ngIf="loading | async" [showMessage]="false"></ds-loading>
+      <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-center text-muted mt-4" >
+        <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+      </h4>
+      <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
+        <!-- Leaf node -->
+        <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
+            <button type="button" class="btn btn-default" cdkTreeNodeToggle>
+              <span class="fas fa-angle-right fa-2x invisible" aria-hidden="true"></span>
+            </button>
+            <button class="btn btn-outline-link btn-sm text-left"
+                    [class.text-success]="node.item?.value === selectedItem?.value"
+                    [disabled]="!node.item?.selectable"
+                    [ngbTooltip]="node.item?.otherInformation?.note"
+                    [openDelay]="500"
+                    container="body"
+                    (click)="onSelect(node.item)">{{node.item.display}}</button>
+        </cdk-tree-node>
+
+        <!-- expandable node -->
+        <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
+            <button type="button" class="btn btn-default" cdkTreeNodeToggle
+                    [attr.aria-label]="'toggle ' + node.name"
+                    (click)="loadChildren(node)">
+              <span class="fas {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}} fa-2x"
+                    aria-hidden="true"></span>
+            </button>
+
+            <button class="btn btn-outline-link btn-sm text-left"
+                    [class.text-success]="node.item?.value === selectedItem?.value"
+                    [disabled]="!node.item?.selectable"
+                    [ngbTooltip]="node.item?.otherInformation?.note"
+                    [openDelay]="500"
+                    container="body"
+                    (click)="onSelect(node.item)">{{node.item.display}}</button>
+        </cdk-tree-node>
+
+        <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
+          <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)">
+            {{'vocabulary-treeview.load-more' | translate}}...
+          </button>
+        </cdk-tree-node>
+
+        <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
+          <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)">
+            {{'vocabulary-treeview.load-more' | translate}}...
+          </button>
+        </cdk-tree-node>
+      </cdk-tree>
+    </div>
+  </div>
+</div>
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.scss
new file mode 100644
index 00000000000..39050ff85b8
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.scss
@@ -0,0 +1,7 @@
+::ng-deep .tooltip-inner {
+  text-align:left;
+}
+
+cdk-tree .btn:focus {
+  box-shadow: none !important;
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts
new file mode 100644
index 00000000000..6166dbc082a
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts
@@ -0,0 +1,230 @@
+import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { CdkTreeModule } from '@angular/cdk/tree';
+
+import { of as observableOf } from 'rxjs';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { createTestComponent } from '../testing/utils.test';
+import { VocabularyTreeviewComponent } from './vocabulary-treeview.component';
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import { CoreState } from '../../core/core.reducers';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { TreeviewFlatNode } from './vocabulary-treeview-node.model';
+import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+
+describe('VocabularyTreeviewComponent test suite', () => {
+
+  let comp: VocabularyTreeviewComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<VocabularyTreeviewComponent>;
+
+  const item = new VocabularyEntryDetail();
+  item.id = 'node1';
+  const item2 = new VocabularyEntryDetail();
+  item2.id = 'node2';
+  const emptyNodeMap = new Map<string, TreeviewFlatNode>();
+  const storedNodeMap = new Map<string, TreeviewFlatNode>().set('test', new TreeviewFlatNode(item2));
+  const nodeMap = new Map<string, TreeviewFlatNode>().set('test', new TreeviewFlatNode(item));
+  const vocabularyOptions = new VocabularyOptions('vocabularyTest', false);
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+  const vocabularyTreeviewServiceStub = jasmine.createSpyObj('VocabularyTreeviewService', {
+    initialize: jasmine.createSpy('initialize'),
+    getData: jasmine.createSpy('getData'),
+    loadMore: jasmine.createSpy('loadMore'),
+    loadMoreRoot: jasmine.createSpy('loadMoreRoot'),
+    isLoading: jasmine.createSpy('isLoading'),
+    searchByQuery: jasmine.createSpy('searchByQuery'),
+    restoreNodes: jasmine.createSpy('restoreNodes'),
+    cleanTree: jasmine.createSpy('cleanTree'),
+  });
+
+  const store: Store<CoreState> = jasmine.createSpyObj('store', {
+    /* tslint:disable:no-empty */
+    dispatch: {},
+    /* tslint:enable:no-empty */
+    pipe: observableOf(true),
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CdkTreeModule,
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        VocabularyTreeviewComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: VocabularyTreeviewService, useValue: vocabularyTreeviewServiceStub },
+        { provide: NgbActiveModal, useValue: modalStub },
+        { provide: Store, useValue: store },
+        ChangeDetectorRef,
+        VocabularyTreeviewComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-vocabulary-treeview [vocabularyOptions]="vocabularyOptions" [preloadLevel]="preloadLevel"></ds-vocabulary-treeview>`;
+
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+      vocabularyTreeviewServiceStub.getData.and.returnValue(observableOf([]));
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create VocabularyTreeviewComponent', inject([VocabularyTreeviewComponent], (app: VocabularyTreeviewComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(VocabularyTreeviewComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      vocabularyTreeviewServiceStub.getData.and.returnValue(observableOf([]));
+      vocabularyTreeviewServiceStub.isLoading.and.returnValue(observableOf(false));
+      comp.vocabularyOptions = vocabularyOptions;
+      comp.selectedItem = null;
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it('should should init component properly', () => {
+      fixture.detectChanges();
+      expect(comp.dataSource.data).toEqual([]);
+      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalled();
+    });
+
+    it('should should init component properly with init value as FormFieldMetadataValueObject', () => {
+      const currentValue = new FormFieldMetadataValueObject();
+      currentValue.value = 'testValue';
+      currentValue.otherInformation = {
+        id: 'entryID'
+      };
+      comp.selectedItem = currentValue;
+      fixture.detectChanges();
+      expect(comp.dataSource.data).toEqual([]);
+      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID');
+    });
+
+    it('should should init component properly with init value as VocabularyEntry', () => {
+      const currentValue = new VocabularyEntry();
+      currentValue.value = 'testValue';
+      currentValue.otherInformation = {
+        id: 'entryID'
+      };
+      comp.selectedItem = currentValue;
+      fixture.detectChanges();
+      expect(comp.dataSource.data).toEqual([]);
+      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID');
+    });
+
+    it('should call loadMore function', () => {
+      comp.loadMore(item);
+      fixture.detectChanges();
+      expect(vocabularyTreeviewServiceStub.loadMore).toHaveBeenCalledWith(item);
+    });
+
+    it('should call loadMoreRoot function', () => {
+      const node = new TreeviewFlatNode(item);
+      comp.loadMoreRoot(node);
+      fixture.detectChanges();
+      expect(vocabularyTreeviewServiceStub.loadMoreRoot).toHaveBeenCalledWith(node);
+    });
+
+    it('should call loadChildren function', () => {
+      const node = new TreeviewFlatNode(item);
+      comp.loadChildren(node);
+      fixture.detectChanges();
+      expect(vocabularyTreeviewServiceStub.loadMore).toHaveBeenCalledWith(node.item, true);
+    });
+
+    it('should emit select event', () => {
+      spyOn(comp, 'onSelect');
+      comp.onSelect(item);
+
+      expect(comp.onSelect).toHaveBeenCalledWith(item);
+    });
+
+    it('should call searchByQuery function and set storedNodeMap properly', () => {
+      comp.searchText = 'test search';
+      comp.nodeMap.set('test', new TreeviewFlatNode(item));
+      comp.search();
+      fixture.detectChanges();
+      expect(vocabularyTreeviewServiceStub.searchByQuery).toHaveBeenCalledWith('test search');
+      expect(comp.storedNodeMap).toEqual(nodeMap);
+      expect(comp.nodeMap).toEqual(emptyNodeMap);
+    });
+
+    it('should call searchByQuery function and not set storedNodeMap', () => {
+      comp.searchText = 'test search';
+      comp.nodeMap.set('test', new TreeviewFlatNode(item));
+      comp.storedNodeMap.set('test', new TreeviewFlatNode(item2));
+      comp.search();
+      fixture.detectChanges();
+      expect(vocabularyTreeviewServiceStub.searchByQuery).toHaveBeenCalledWith('test search');
+      expect(comp.storedNodeMap).toEqual(storedNodeMap);
+      expect(comp.nodeMap).toEqual(emptyNodeMap);
+    });
+
+    it('should call restoreNodes function and restore nodeMap properly', () => {
+      comp.nodeMap.set('test', new TreeviewFlatNode(item));
+      comp.storedNodeMap.set('test', new TreeviewFlatNode(item2));
+      comp.reset();
+      fixture.detectChanges();
+      expect(vocabularyTreeviewServiceStub.restoreNodes).toHaveBeenCalled();
+      expect(comp.storedNodeMap).toEqual(emptyNodeMap);
+      expect(comp.nodeMap).toEqual(storedNodeMap);
+      expect(comp.searchText).toEqual('');
+    });
+
+    it('should clear search string', () => {
+      comp.nodeMap.set('test', new TreeviewFlatNode(item));
+      comp.reset();
+      fixture.detectChanges();
+      expect(comp.storedNodeMap).toEqual(emptyNodeMap);
+      expect(comp.nodeMap).toEqual(nodeMap);
+      expect(comp.searchText).toEqual('');
+    });
+
+    it('should call cleanTree method on destroy', () => {
+      compAsAny.ngOnDestroy();
+      expect(vocabularyTreeviewServiceStub.cleanTree).toHaveBeenCalled();
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+  vocabularyOptions: VocabularyOptions = new VocabularyOptions('vocabularyTest', false);
+  preloadLevel = 2;
+
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
new file mode 100644
index 00000000000..9eb4bb860c6
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -0,0 +1,307 @@
+import { FlatTreeControl } from '@angular/cdk/tree';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { filter, find, startWith } from 'rxjs/operators';
+import { Observable, Subscription } from 'rxjs';
+import { select, Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
+import { isAuthenticated } from '../../core/auth/selectors';
+import { CoreState } from '../../core/core.reducers';
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import { LOAD_MORE, LOAD_MORE_ROOT, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
+import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
+
+/**
+ * Component that show a hierarchical vocabulary in a tree view
+ */
+@Component({
+  selector: 'ds-vocabulary-treeview',
+  templateUrl: './vocabulary-treeview.component.html',
+  styleUrls: ['./vocabulary-treeview.component.scss']
+})
+export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
+
+  /**
+   * The {@link VocabularyOptions} object
+   */
+  @Input() vocabularyOptions: VocabularyOptions;
+
+  /**
+   * Representing how many tree level load at initialization
+   */
+  @Input() preloadLevel = 2;
+
+  /**
+   * The vocabulary entry already selected, if any
+   */
+  @Input() selectedItem: any = null;
+
+  /**
+   * Contain a descriptive message for this vocabulary retrieved from i18n files
+   */
+  description: Observable<string>;
+
+  /**
+   * A map containing the current node showed by the tree
+   */
+  nodeMap = new Map<string, TreeviewFlatNode>();
+
+  /**
+   * A map containing all the node already created for building the tree
+   */
+  storedNodeMap = new Map<string, TreeviewFlatNode>();
+
+  /**
+   * Flat tree control object. Able to expand/collapse a subtree recursively for flattened tree.
+   */
+  treeControl: FlatTreeControl<TreeviewFlatNode>;
+
+  /**
+   * Tree flattener object. Able to convert a normal type of node to node with children and level information.
+   */
+  treeFlattener: VocabularyTreeFlattener<TreeviewNode, TreeviewFlatNode>;
+
+  /**
+   * Flat tree data source
+   */
+  dataSource: VocabularyTreeFlatDataSource<TreeviewNode, TreeviewFlatNode>;
+
+  /**
+   * The content of the search box used to search for a vocabulary entry
+   */
+  searchText: string;
+
+  /**
+   * A boolean representing if tree is loading
+   */
+  loading: Observable<boolean>;
+
+  /**
+   * An event fired when a vocabulary entry is selected.
+   * Event's payload equals to {@link VocabularyEntryDetail} selected.
+   */
+  @Output() select: EventEmitter<VocabularyEntryDetail> = new EventEmitter<VocabularyEntryDetail>(null);
+
+  /**
+   * A boolean representing if user is authenticated
+   */
+  private isAuthenticated: Observable<boolean>;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {NgbActiveModal} activeModal
+   * @param {VocabularyTreeviewService} vocabularyTreeviewService
+   * @param {Store<CoreState>} store
+   * @param {TranslateService} translate
+   */
+  constructor(
+    public activeModal: NgbActiveModal,
+    private vocabularyTreeviewService: VocabularyTreeviewService,
+    private store: Store<CoreState>,
+    private translate: TranslateService
+  ) {
+    this.treeFlattener = new VocabularyTreeFlattener(this.transformer, this.getLevel,
+      this.isExpandable, this.getChildren);
+
+    this.treeControl = new FlatTreeControl<TreeviewFlatNode>(this.getLevel, this.isExpandable);
+
+    this.dataSource = new VocabularyTreeFlatDataSource(this.treeControl, this.treeFlattener);
+  }
+
+  /**
+   * Get children for a given node
+   * @param node The node for which to retrieve the children
+   */
+  getChildren = (node: TreeviewNode): Observable<TreeviewNode[]> => node.childrenChange;
+
+  /**
+   * Transform a {@link TreeviewNode} to {@link TreeviewFlatNode}
+   * @param node The node to transform
+   * @param level The node level information
+   */
+  transformer = (node: TreeviewNode, level: number) => {
+    const existingNode = this.nodeMap.get(node.item.id);
+
+    if (existingNode && existingNode.item.id !== LOAD_MORE && existingNode.item.id !== LOAD_MORE_ROOT) {
+      return existingNode;
+    }
+
+    const newNode: TreeviewFlatNode = new TreeviewFlatNode(
+      node.item,
+      level,
+      node.hasChildren,
+      (node.hasChildren && isNotEmpty(node.children)),
+      node.pageInfo,
+      node.loadMoreParentItem,
+      node.isSearchNode,
+      node.isInInitValueHierarchy
+    );
+    this.nodeMap.set(node.item.id, newNode);
+
+    if ((((level + 1) < this.preloadLevel) && newNode.childrenLoaded)
+      || (newNode.isSearchNode && newNode.childrenLoaded)
+      || newNode.isInInitValueHierarchy) {
+      if (!newNode.isSearchNode) {
+        this.loadChildren(newNode);
+      }
+      this.treeControl.expand(newNode);
+    }
+    return newNode;
+  };
+
+  /**
+   * Get tree level for a given node
+   * @param node The node for which to retrieve the level
+   */
+  getLevel = (node: TreeviewFlatNode) => node.level;
+
+  /**
+   * Check if a given node is expandable
+   * @param node The node for which to retrieve the information
+   */
+  isExpandable = (node: TreeviewFlatNode) => node.expandable;
+
+  /**
+   * Check if a given node has children
+   * @param _nodeData The node for which to retrieve the information
+   */
+  hasChildren = (_: number, _nodeData: TreeviewFlatNode) => _nodeData.expandable;
+
+  /**
+   * Check if a given node has more children to load
+   * @param _nodeData The node for which to retrieve the information
+   */
+  isLoadMore = (_: number, _nodeData: TreeviewFlatNode) => _nodeData.item.id === LOAD_MORE;
+
+  /**
+   * Check if there are more node to load at root level
+   * @param _nodeData The node for which to retrieve the information
+   */
+  isLoadMoreRoot = (_: number, _nodeData: TreeviewFlatNode) => _nodeData.item.id === LOAD_MORE_ROOT;
+
+  /**
+   * Initialize the component, setting up the data to build the tree
+   */
+  ngOnInit(): void {
+    this.subs.push(
+      this.vocabularyTreeviewService.getData().subscribe((data) => {
+        this.dataSource.data = data;
+      })
+    );
+
+    const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name;
+    this.description = this.translate.get(descriptionLabel).pipe(
+      filter((msg) => msg !== descriptionLabel),
+      startWith('')
+    );
+
+    // set isAuthenticated
+    this.isAuthenticated = this.store.pipe(select(isAuthenticated));
+
+    this.loading = this.vocabularyTreeviewService.isLoading();
+
+    this.isAuthenticated.pipe(
+      find((isAuth) => isAuth)
+    ).subscribe(() => {
+      const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null;
+      this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId);
+    });
+  }
+
+  /**
+   * Expand a node whose children are not loaded
+   * @param item The VocabularyEntryDetail for which to load more nodes
+   */
+  loadMore(item: VocabularyEntryDetail) {
+    this.vocabularyTreeviewService.loadMore(item);
+  }
+
+  /**
+   * Expand the root node whose children are not loaded
+   * @param node The TreeviewFlatNode for which to load more nodes
+   */
+  loadMoreRoot(node: TreeviewFlatNode) {
+    this.vocabularyTreeviewService.loadMoreRoot(node);
+  }
+
+  /**
+   * Load children nodes for a node
+   * @param node The TreeviewFlatNode for which to load children nodes
+   */
+  loadChildren(node: TreeviewFlatNode) {
+    this.vocabularyTreeviewService.loadMore(node.item, true);
+  }
+
+  /**
+   * Method called on entry select
+   * Emit a new select Event
+   */
+  onSelect(item: VocabularyEntryDetail) {
+    this.select.emit(item);
+    this.activeModal.close(item);
+  }
+
+  /**
+   * Search for a vocabulary entry by query
+   */
+  search() {
+    if (isNotEmpty(this.searchText)) {
+      if (isEmpty(this.storedNodeMap)) {
+        this.storedNodeMap = this.nodeMap;
+      }
+      this.nodeMap = new Map<string, TreeviewFlatNode>();
+      this.vocabularyTreeviewService.searchByQuery(this.searchText);
+    }
+  }
+
+  /**
+   * Check if search box contains any text
+   */
+  isSearchEnabled() {
+    return isNotEmpty(this.searchText);
+  }
+
+  /**
+   * Reset tree resulting from a previous search
+   */
+  reset() {
+    if (isNotEmpty(this.storedNodeMap)) {
+      this.nodeMap = this.storedNodeMap;
+      this.storedNodeMap = new Map<string, TreeviewFlatNode>();
+      this.vocabularyTreeviewService.restoreNodes();
+    }
+
+    this.searchText = '';
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.vocabularyTreeviewService.cleanTree();
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Return an id for a given {@link VocabularyEntry}
+   */
+  private getEntryId(entry: VocabularyEntry): string {
+    return entry.authority || entry.otherInformation.id || undefined;
+  }
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts
new file mode 100644
index 00000000000..fb97599529b
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts
@@ -0,0 +1,347 @@
+import { async, TestBed } from '@angular/core/testing';
+
+import { TestScheduler } from 'rxjs/testing';
+import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import { getTestScheduler, hot } from 'jasmine-marbles';
+
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import { VocabularyService } from '../../core/submission/vocabularies/vocabulary.service';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import {
+  LOAD_MORE_NODE,
+  LOAD_MORE_ROOT_NODE,
+  TreeviewFlatNode,
+  TreeviewNode
+} from './vocabulary-treeview-node.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+
+describe('VocabularyTreeviewService test suite', () => {
+
+  let scheduler: TestScheduler;
+  let service: VocabularyTreeviewService;
+  let serviceAsAny: any;
+  let loadMoreNode: TreeviewNode;
+  let loadMoreRootNode: TreeviewNode;
+  let loadMoreRootFlatNode: TreeviewFlatNode;
+  let item: VocabularyEntryDetail;
+  let itemNode: TreeviewNode;
+  let item2: VocabularyEntryDetail;
+  let itemNode2: TreeviewNode;
+  let item3: VocabularyEntryDetail;
+  let itemNode3: TreeviewNode;
+  let item5: VocabularyEntryDetail;
+  let itemNode5: TreeviewNode;
+  let child: VocabularyEntryDetail;
+  let childNode: TreeviewNode;
+  let child2: VocabularyEntryDetail;
+  let childNode2: TreeviewNode;
+  let childEntry3: VocabularyEntry;
+  let child3: VocabularyEntryDetail;
+  let childNode3: TreeviewNode;
+  let searchItemNode: TreeviewNode;
+  let searchChildNode: TreeviewNode;
+  let searchChildNode3: TreeviewNode;
+  let initValueChildNode: TreeviewNode;
+  let initValueChildNode2: TreeviewNode;
+
+  let treeNodeList: TreeviewNode[];
+  let treeNodeListWithChildren: TreeviewNode[];
+  let treeNodeListWithLoadMore: TreeviewNode[];
+  let treeNodeListWithLoadMoreRoot: TreeviewNode[];
+  let nodeMap: Map<string, TreeviewNode>;
+  let nodeMapWithChildren: Map<string, TreeviewNode>;
+  let searchNodeMap: Map<string, TreeviewNode>;
+  let vocabularyOptions;
+  let pageInfo: PageInfo;
+
+  const vocabularyServiceStub = jasmine.createSpyObj('VocabularyService', {
+    getVocabularyEntriesByValue: jasmine.createSpy('getVocabularyEntriesByValue'),
+    getEntryDetailParent: jasmine.createSpy('getEntryDetailParent'),
+    findEntryDetailById: jasmine.createSpy('findEntryDetailById'),
+    searchTopEntries: jasmine.createSpy('searchTopEntries'),
+    getEntryDetailChildren: jasmine.createSpy('getEntryDetailChildren'),
+    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests')
+  });
+
+  function init() {
+
+    pageInfo = Object.assign(new PageInfo(), {
+      elementsPerPage: 1,
+      totalElements: 3,
+      totalPages: 1,
+      currentPage: 1
+    });
+    loadMoreNode = new TreeviewNode(LOAD_MORE_NODE, false, new PageInfo(), item);
+    loadMoreRootNode = new TreeviewNode(LOAD_MORE_ROOT_NODE, false, new PageInfo(), null);
+    loadMoreRootFlatNode = new TreeviewFlatNode(LOAD_MORE_ROOT_NODE, 1, false, false, new PageInfo(), null);
+    item = new VocabularyEntryDetail();
+    item.id = 'vocabularyTest:root1';
+    item.value = item.display = 'root1';
+    item.otherInformation = { hasChildren: 'true', id: 'root1' };
+    itemNode = new TreeviewNode(item, true, pageInfo);
+    searchItemNode = new TreeviewNode(item, true, new PageInfo(), null, true);
+
+    item2 = new VocabularyEntryDetail();
+    item2.id = 'vocabularyTest:root2';
+    item2.value = item2.display = 'root2';
+    item2.otherInformation = { id: 'root2' };
+    itemNode2 = new TreeviewNode(item2, false, pageInfo);
+
+    item3 = new VocabularyEntryDetail();
+    item3.id = 'vocabularyTest:root3';
+    item3.value = item3.display = 'root3';
+    item3.otherInformation = { id: 'root3' };
+    itemNode3 = new TreeviewNode(item3, false, pageInfo);
+
+    child = new VocabularyEntryDetail();
+    child.id = 'vocabularyTest:root1-child1';
+    child.value = child.display = 'root1-child1';
+    child.otherInformation = { parent: 'root1', hasChildren: 'true', id: 'root1-child1' };
+    childNode = new TreeviewNode(child);
+    searchChildNode = new TreeviewNode(child, true, new PageInfo(), item, true);
+
+    childEntry3 = new VocabularyEntry();
+    childEntry3.value = childEntry3.display = 'root1-child1-child1';
+    childEntry3.otherInformation = { parent: 'root1-child1', id: 'root1-child1-child1' };
+    child3 = new VocabularyEntryDetail();
+    child3.id = 'vocabularyTest:root1-child1-child1';
+    child3.value = child3.display = 'root1-child1-child1';
+    child3.otherInformation = { parent: 'root1-child1', id: 'root1-child1-child1' };
+    childNode3 = new TreeviewNode(child3);
+    searchChildNode3 = new TreeviewNode(child3, false, new PageInfo(), child, true);
+
+    child2 = new VocabularyEntryDetail();
+    child2.id = 'vocabularyTest:root1-child2';
+    child2.value = child2.display = 'root1-child2';
+    child2.otherInformation = { parent: 'root1', id: 'root1-child2' };
+    childNode2 = new TreeviewNode(child2, true);
+    initValueChildNode2 = new TreeviewNode(child2, false, new PageInfo(), item, false, true);
+    initValueChildNode = new TreeviewNode(child, true, new PageInfo(), item, false, true);
+    initValueChildNode.childrenChange.next([initValueChildNode2]);
+
+    item5 = new VocabularyEntryDetail();
+    item5.id = item5.value = item5.display = 'root4';
+    item5.otherInformation = { id: 'root4' };
+    itemNode5 = new TreeviewNode(item5);
+
+    treeNodeList = [
+      itemNode,
+      itemNode2,
+      itemNode3
+    ];
+    treeNodeListWithChildren = [
+      itemNode,
+      itemNode2,
+      itemNode3,
+      childNode
+    ];
+    treeNodeListWithLoadMoreRoot = treeNodeList;
+    treeNodeListWithLoadMore = treeNodeListWithChildren;
+    treeNodeListWithLoadMoreRoot.push(loadMoreRootNode);
+    treeNodeListWithLoadMore.push(loadMoreNode);
+
+    nodeMap = new Map<string, TreeviewNode>([
+      [item.id, itemNode],
+      [item2.id, itemNode2],
+      [item3.id, itemNode3]
+    ]);
+
+    nodeMapWithChildren = new Map<string, TreeviewNode>([
+      [item.id, itemNode],
+      [item2.id, itemNode2],
+      [item3.id, itemNode3],
+      [child.id, childNode],
+    ]);
+
+    searchNodeMap = new Map<string, TreeviewNode>([
+      [item.id, searchItemNode],
+    ]);
+    vocabularyOptions = new VocabularyOptions('vocabularyTest', false);
+  }
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })
+      ],
+      providers: [
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
+        VocabularyTreeviewService,
+        TranslateService
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = TestBed.get(VocabularyTreeviewService);
+    serviceAsAny = service;
+    scheduler = getTestScheduler();
+    init();
+  });
+
+  describe('initialize', () => {
+    it('should set vocabularyName and call retrieveTopNodes method', () => {
+      serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('-a', {
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+      }));
+
+      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo));
+      scheduler.flush();
+
+      expect(serviceAsAny.vocabularyName).toEqual(vocabularyOptions.name);
+      expect(serviceAsAny.pageInfo).toEqual(pageInfo);
+      expect(serviceAsAny.dataChange.value).toEqual([itemNode, itemNode2, itemNode3]);
+    });
+
+    it('should set initValueHierarchy', () => {
+      serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('-c', {
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+      }));
+      serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(
+        hot('-a', {
+          a: createSuccessfulRemoteDataObject(child2)
+        })
+      );
+      serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValue(
+        hot('-b', {
+          b: createSuccessfulRemoteDataObject(item)
+        })
+      );
+      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, 'root2'));
+      scheduler.flush();
+
+      expect(serviceAsAny.vocabularyName).toEqual(vocabularyOptions.name);
+      expect(serviceAsAny.initValueHierarchy).toEqual(['root1', 'root1-child2']);
+    });
+  });
+
+  describe('getData', () => {
+    it('should return dataChange', () => {
+      const result = service.getData();
+
+      expect(result).toEqual(serviceAsAny.dataChange);
+    });
+  });
+
+  describe('loadMoreRoot', () => {
+    it('should call retrieveTopNodes properly', () => {
+      spyOn(serviceAsAny, 'retrieveTopNodes');
+      service.initialize(vocabularyOptions, new PageInfo());
+      serviceAsAny.dataChange.next(treeNodeListWithLoadMoreRoot);
+      service.loadMoreRoot(loadMoreRootFlatNode);
+
+      expect(serviceAsAny.retrieveTopNodes).toHaveBeenCalledWith(loadMoreRootFlatNode.pageInfo, treeNodeList);
+    });
+  });
+
+  describe('loadMore', () => {
+
+    beforeEach(() => {
+      init();
+      itemNode.childrenChange.next([childNode]);
+    });
+
+    it('should add children nodes properly', () => {
+      pageInfo = Object.assign(new PageInfo(), {
+        elementsPerPage: 1,
+        totalElements: 2,
+        totalPages: 2,
+        currentPage: 2
+      });
+      spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
+        a: buildPaginatedList(pageInfo, [child2])
+      }));
+
+      serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
+      serviceAsAny.nodeMap = nodeMapWithChildren;
+      treeNodeListWithChildren.push(new TreeviewNode(child2, false, new PageInfo(), item));
+
+      scheduler.schedule(() => service.loadMore(item));
+      scheduler.flush();
+
+      expect(serviceAsAny.dataChange.value).toEqual(treeNodeListWithChildren);
+    });
+
+    it('should add loadMore node properly', () => {
+      pageInfo = Object.assign(new PageInfo(), {
+        elementsPerPage: 1,
+        totalElements: 2,
+        totalPages: 2,
+        currentPage: 1
+      });
+      spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
+        a: buildPaginatedList(pageInfo, [child2])
+      }));
+
+      serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
+      serviceAsAny.nodeMap = nodeMapWithChildren;
+      treeNodeListWithChildren.push(childNode2);
+      treeNodeListWithChildren.push(loadMoreNode);
+
+      scheduler.schedule(() => service.loadMore(item));
+      scheduler.flush();
+
+      expect(serviceAsAny.dataChange.value).toEqual(treeNodeListWithChildren);
+    });
+
+  });
+
+  describe('searchByQuery', () => {
+    it('should set tree data properly after a search', () => {
+      pageInfo = Object.assign(new PageInfo(), {
+        elementsPerPage: 1,
+        totalElements: 1,
+        totalPages: 1,
+        currentPage: 1
+      });
+      serviceAsAny.vocabularyService.getVocabularyEntriesByValue.and.returnValue(hot('-a', {
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [childEntry3]))
+      }));
+
+      serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(hot('-a', {
+        a: createSuccessfulRemoteDataObject(child3)
+      }));
+
+      serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValues(
+        hot('-a', {
+          a: createSuccessfulRemoteDataObject(child)
+        }),
+        hot('-b', {
+          b: createSuccessfulRemoteDataObject(item)
+        })
+      );
+      vocabularyOptions.query = 'root1-child1-child1';
+
+      scheduler.schedule(() => service.searchByQuery(vocabularyOptions));
+      scheduler.flush();
+
+      searchChildNode.childrenChange.next([searchChildNode3]);
+      searchItemNode.childrenChange.next([searchChildNode]);
+      expect(serviceAsAny.dataChange.value.length).toEqual(1);
+      expect(serviceAsAny.dataChange.value).toEqual([searchItemNode]);
+    });
+  });
+
+  describe('restoreNodes', () => {
+    it('should restore nodes properly', () => {
+      serviceAsAny.storedNodes = treeNodeList;
+      serviceAsAny.storedNodeMap = nodeMap;
+      serviceAsAny.nodeMap = searchNodeMap;
+
+      service.restoreNodes();
+
+      expect(serviceAsAny.nodeMap).toEqual(nodeMap);
+      expect(serviceAsAny.dataChange.value).toEqual(treeNodeList);
+    });
+  });
+});
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.ts
new file mode 100644
index 00000000000..5e8d027cd81
--- /dev/null
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.ts
@@ -0,0 +1,384 @@
+import { Injectable } from '@angular/core';
+
+import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import { flatMap, map, merge, scan } from 'rxjs/operators';
+import { findIndex } from 'lodash';
+
+import {
+  LOAD_MORE_NODE,
+  LOAD_MORE_ROOT_NODE,
+  TreeviewFlatNode,
+  TreeviewNode
+} from './vocabulary-treeview-node.model';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../core/submission/vocabularies/vocabulary.service';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { isEmpty, isNotEmpty } from '../empty.util';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteListPayload
+} from '../../core/shared/operators';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+
+/**
+ * A service that provides methods to deal with vocabulary tree
+ */
+@Injectable()
+export class VocabularyTreeviewService {
+
+  /**
+   * A map containing the current node showed by the tree
+   */
+  nodeMap = new Map<string, TreeviewNode>();
+
+  /**
+   * A map containing all the node already created for building the tree
+   */
+  storedNodeMap = new Map<string, TreeviewNode>();
+
+  /**
+   * An array containing all the node already created for building the tree
+   */
+  storedNodes: TreeviewNode[] = [];
+
+  /**
+   * The {@link VocabularyOptions} object
+   */
+  private vocabularyOptions: VocabularyOptions;
+
+  /**
+   * The vocabulary name
+   */
+  private vocabularyName = '';
+
+  /**
+   * Contains the current tree data
+   */
+  private dataChange = new BehaviorSubject<TreeviewNode[]>([]);
+
+  /**
+   * Array containing node'ids hierarchy
+   */
+  private initValueHierarchy: string[] = [];
+
+  /**
+   * A boolean representing if any operation is pending
+   */
+  private loading = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The {@link PageInfo} object
+   */
+  private pageInfo: PageInfo;
+  /**
+   * An observable to change the loading status
+   */
+  private hideSearchingWhenUnsubscribed$ = new Observable(() => () => this.loading.next(false));
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {VocabularyService} vocabularyService
+   */
+  constructor(private vocabularyService: VocabularyService) {
+  }
+
+  /**
+   * Remove nodes saved from maps and array
+   */
+  cleanTree() {
+    this.nodeMap = new Map<string, TreeviewNode>();
+    this.storedNodeMap = new Map<string, TreeviewNode>();
+    this.storedNodes = [];
+    this.initValueHierarchy = [];
+    this.dataChange.next([]);
+  }
+
+  /**
+   * Initialize the tree's nodes
+   *
+   * @param options The {@link VocabularyOptions} object
+   * @param pageInfo The {@link PageInfo} object
+   * @param initValueId The entry id of the node to mark as selected, if any
+   */
+  initialize(options: VocabularyOptions, pageInfo: PageInfo, initValueId?: string): void {
+    this.loading.next(true);
+    this.vocabularyOptions = options;
+    this.vocabularyName = options.name;
+    this.pageInfo = pageInfo;
+    if (isNotEmpty(initValueId)) {
+      this.getNodeHierarchyById(initValueId)
+        .subscribe((hierarchy: string[]) => {
+          this.initValueHierarchy = hierarchy;
+          this.retrieveTopNodes(pageInfo, []);
+      })
+    } else {
+      this.retrieveTopNodes(pageInfo, []);
+    }
+  }
+
+  /**
+   * Returns array of the tree's nodes
+   */
+  getData(): Observable<TreeviewNode[]> {
+    return this.dataChange
+  }
+
+  /**
+   * Expand the root node whose children are not loaded
+   * @param node The root node
+   */
+  loadMoreRoot(node: TreeviewFlatNode) {
+    const nodes = this.dataChange.value;
+    nodes.pop();
+    this.retrieveTopNodes(node.pageInfo, nodes);
+  }
+
+  /**
+   * Expand a node whose children are not loaded
+   * @param item
+   * @param onlyFirstTime
+   */
+  loadMore(item: VocabularyEntryDetail, onlyFirstTime = false) {
+    if (!this.nodeMap.has(item.otherInformation.id)) {
+      return;
+    }
+    const parent: TreeviewNode = this.nodeMap.get(item.otherInformation.id)!;
+    const children = this.nodeMap.get(item.otherInformation.id)!.children || [];
+    children.pop();
+    this.getChildrenNodesByParent(item.otherInformation.id, parent.pageInfo).subscribe((list: PaginatedList<VocabularyEntryDetail>) => {
+
+      if (onlyFirstTime && parent.children!.length > 0) {
+        return;
+      }
+
+      const newNodes: TreeviewNode[] = list.page.map((entry) => this._generateNode(entry));
+      children.push(...newNodes);
+
+      if ((list.pageInfo.currentPage + 1) <= list.pageInfo.totalPages) {
+        // Update page info
+        const newPageInfo: PageInfo = Object.assign(new PageInfo(), list.pageInfo, {
+          currentPage: list.pageInfo.currentPage + 1
+        });
+        parent.updatePageInfo(newPageInfo);
+
+        // Need a new load more node
+        children.push(new TreeviewNode(LOAD_MORE_NODE, false, newPageInfo, item));
+      }
+      parent.childrenChange.next(children);
+      this.dataChange.next(this.dataChange.value);
+    })
+
+  }
+
+  /**
+   * Check if any operation is pending
+   */
+  isLoading(): Observable<boolean> {
+    return this.loading;
+  }
+
+  /**
+   * Perform a search operation by query
+   */
+  searchByQuery(query: string) {
+    this.loading.next(true);
+    if (isEmpty(this.storedNodes)) {
+      this.storedNodes = this.dataChange.value;
+      this.storedNodeMap = this.nodeMap;
+    }
+    this.nodeMap = new Map<string, TreeviewNode>();
+    this.dataChange.next([]);
+
+    this.vocabularyService.getVocabularyEntriesByValue(query, false, this.vocabularyOptions, new PageInfo()).pipe(
+      getFirstSucceededRemoteListPayload(),
+      flatMap((result: VocabularyEntry[]) => (result.length > 0) ? result : observableOf(null)),
+      flatMap((entry: VocabularyEntry) =>
+        this.vocabularyService.findEntryDetailById(entry.otherInformation.id, this.vocabularyName).pipe(
+          getFirstSucceededRemoteDataPayload()
+        )
+      ),
+      flatMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry)),
+      scan((acc: TreeviewNode[], value: TreeviewNode) => {
+        if (isEmpty(value) || findIndex(acc, (node) => node.item.otherInformation.id === value.item.otherInformation.id) !== -1) {
+          return acc;
+        } else {
+          return [...acc, value]
+        }
+      }, []),
+      merge(this.hideSearchingWhenUnsubscribed$)
+    ).subscribe((nodes: TreeviewNode[]) => {
+      this.dataChange.next(nodes);
+      this.loading.next(false);
+    })
+  }
+
+  /**
+   * Reset tree state with the one before the search
+   */
+  restoreNodes() {
+    this.loading.next(false);
+    this.dataChange.next(this.storedNodes);
+    this.nodeMap = this.storedNodeMap;
+
+    this.storedNodeMap = new Map<string, TreeviewNode>();
+    this.storedNodes = [];
+  }
+
+  /**
+   * Generate a {@link TreeviewNode} object from vocabulary entry
+   *
+   * @param entry The vocabulary entry detail
+   * @param isSearchNode A Boolean representing if given entry is the result of a search
+   * @param toStore A Boolean representing if the node created is to store or not
+   * @return TreeviewNode
+   */
+  private _generateNode(entry: VocabularyEntryDetail, isSearchNode = false, toStore = true): TreeviewNode {
+    const entryId = entry.otherInformation.id;
+    if (this.nodeMap.has(entryId)) {
+      return this.nodeMap.get(entryId)!;
+    }
+    const hasChildren = entry.hasOtherInformation() && (entry.otherInformation as any)!.hasChildren === 'true';
+    const pageInfo: PageInfo = this.pageInfo;
+    const isInInitValueHierarchy = this.initValueHierarchy.includes(entryId);
+    const result = new TreeviewNode(
+      entry,
+      hasChildren,
+      pageInfo,
+      null,
+      isSearchNode,
+      isInInitValueHierarchy);
+
+    if (toStore) {
+      this.nodeMap.set(entryId, result);
+    }
+    return result;
+  }
+
+  /**
+   * Return the node Hierarchy by a given node's id
+   * @param id The node id
+   * @return Observable<string[]>
+   */
+  private getNodeHierarchyById(id: string): Observable<string[]> {
+    return this.getById(id).pipe(
+      flatMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry, [], false)),
+      map((node: TreeviewNode) => this.getNodeHierarchyIds(node))
+    );
+  }
+
+  /**
+   * Return the vocabulary entry's children
+   * @param parentId The node id
+   * @param pageInfo The {@link PageInfo} object
+   * @return Observable<PaginatedList<VocabularyEntryDetail>>
+   */
+  private getChildrenNodesByParent(parentId: string, pageInfo: PageInfo): Observable<PaginatedList<VocabularyEntryDetail>> {
+    return this.vocabularyService.getEntryDetailChildren(parentId, this.vocabularyName, pageInfo).pipe(
+      getFirstSucceededRemoteDataPayload()
+    );
+  }
+
+  /**
+   * Return the vocabulary entry's parent
+   * @param entryId The entry id
+   */
+  private getParentNode(entryId: string): Observable<VocabularyEntryDetail> {
+    return this.vocabularyService.getEntryDetailParent(entryId, this.vocabularyName).pipe(
+      getFirstSucceededRemoteDataPayload()
+    );
+  }
+
+  /**
+   * Return the vocabulary entry by id
+   * @param entryId The entry id
+   * @return Observable<VocabularyEntryDetail>
+   */
+  private getById(entryId: string): Observable<VocabularyEntryDetail> {
+    return this.vocabularyService.findEntryDetailById(entryId, this.vocabularyName).pipe(
+      getFirstSucceededRemoteDataPayload()
+    );
+  }
+
+  /**
+   * Retrieve the top level vocabulary entries
+   * @param pageInfo The {@link PageInfo} object
+   * @param nodes The top level nodes already loaded, if any
+   */
+  private retrieveTopNodes(pageInfo: PageInfo, nodes: TreeviewNode[]): void {
+    this.vocabularyService.searchTopEntries(this.vocabularyName, pageInfo).pipe(
+      getFirstSucceededRemoteDataPayload()
+    ).subscribe((list: PaginatedList<VocabularyEntryDetail>) => {
+      this.vocabularyService.clearSearchTopRequests();
+      const newNodes: TreeviewNode[] = list.page.map((entry: VocabularyEntryDetail) => this._generateNode(entry));
+      nodes.push(...newNodes);
+
+      if ((list.pageInfo.currentPage + 1) <= list.pageInfo.totalPages) {
+        // Need a new load more node
+        const newPageInfo: PageInfo = Object.assign(new PageInfo(), list.pageInfo, {
+          currentPage: list.pageInfo.currentPage + 1
+        });
+        const loadMoreNode = new TreeviewNode(LOAD_MORE_ROOT_NODE, false, newPageInfo);
+        loadMoreNode.updatePageInfo(newPageInfo);
+        nodes.push(loadMoreNode);
+      }
+      this.loading.next(false);
+      // Notify the change.
+      this.dataChange.next(nodes);
+    });
+  }
+
+  /**
+   * Build and return the tree node hierarchy by a given vocabulary entry
+   *
+   * @param item The vocabulary entry
+   * @param children The vocabulary entry
+   * @param toStore A Boolean representing if the node created is to store or not
+   * @return Observable<string[]>
+   */
+  private getNodeHierarchy(item: VocabularyEntryDetail, children?: TreeviewNode[], toStore = true): Observable<TreeviewNode> {
+    if (isEmpty(item)) {
+      return observableOf(null);
+    }
+    const node = this._generateNode(item, toStore, toStore);
+
+    if (isNotEmpty(children)) {
+      const newChildren = children
+        .filter((entry: TreeviewNode) => {
+          return findIndex(node.children, (nodeEntry) => nodeEntry.item.otherInformation.id === entry.item.otherInformation.id) === -1;
+        });
+      newChildren.forEach((entry: TreeviewNode) => {
+        entry.loadMoreParentItem = node.item
+      });
+      node.children.push(...newChildren);
+    }
+
+    if (node.item.hasOtherInformation() && isNotEmpty(node.item.otherInformation.parent)) {
+      return this.getParentNode(node.item.otherInformation.id).pipe(
+        flatMap((parentItem: VocabularyEntryDetail) => this.getNodeHierarchy(parentItem, [node], toStore))
+      )
+    } else {
+      return observableOf(node);
+    }
+  }
+
+  /**
+   * Build and return the node Hierarchy ids by a given node
+   *
+   * @param node The given node
+   * @param hierarchyIds The ids already present in the Hierarchy's array
+   * @return string[]
+   */
+  private getNodeHierarchyIds(node: TreeviewNode, hierarchyIds: string[] = []): string[] {
+    if (!hierarchyIds.includes(node.item.otherInformation.id)) {
+      hierarchyIds.push(node.item.otherInformation.id);
+    }
+    if (isNotEmpty(node.children)) {
+      return this.getNodeHierarchyIds(node.children[0], hierarchyIds);
+    } else {
+      return hierarchyIds;
+    }
+  }
+}
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.scss b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
new file mode 100644
index 00000000000..bcdd5b5641c
--- /dev/null
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
@@ -0,0 +1,112 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { of as observableOf } from 'rxjs';
+import { Collection } from '../../core/shared/collection.model';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { SharedModule } from '../../shared/shared.module';
+import { CommonModule } from '@angular/common';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+
+describe('CollectionStatisticsPageComponent', () => {
+
+  let component: CollectionStatisticsPageComponent;
+  let de: DebugElement;
+  let fixture: ComponentFixture<CollectionStatisticsPageComponent>;
+
+  beforeEach(async(() => {
+
+    const activatedRoute = {
+      data: observableOf({
+        scope: createSuccessfulRemoteDataObject(
+          Object.assign(new Collection(), {
+            id: 'collection_id',
+          })
+        )
+      })
+    };
+
+    const router = {
+    };
+
+    const usageReportService = {
+      getStatistic: (scope, type) => undefined,
+    };
+
+    spyOn(usageReportService, 'getStatistic').and.callFake(
+      (scope, type) => observableOf(
+        Object.assign(
+          new UsageReport(), {
+            id: `${scope}-${type}-report`,
+            points: [],
+          }
+        )
+      )
+    );
+
+    const nameService = {
+      getName: () => observableOf('test dso name'),
+    };
+
+    const authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      setRedirectUrl: {}
+    });
+
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        CommonModule,
+        SharedModule,
+      ],
+      declarations: [
+        CollectionStatisticsPageComponent,
+        StatisticsTableComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router, useValue: router },
+        { provide: UsageReportService, useValue: usageReportService },
+        { provide: DSpaceObjectDataService, useValue: {} },
+        { provide: DSONameService, useValue: nameService },
+        { provide: AuthService, useValue: authService },
+      ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionStatisticsPageComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should resolve to the correct collection', () => {
+    expect(de.query(By.css('.header')).nativeElement.id)
+      .toEqual('collection_id');
+  });
+
+  it('should show a statistics table for each usage report', () => {
+    expect(de.query(By.css('ds-statistics-table.collection_id-TotalVisits-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.collection_id-TotalVisitsPerMonth-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.collection_id-TopCountries-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.collection_id-TopCities-report')).nativeElement)
+      .toBeTruthy();
+  });
+});
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
new file mode 100644
index 00000000000..41ee47ff886
--- /dev/null
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
@@ -0,0 +1,44 @@
+import { Component } from '@angular/core';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { ActivatedRoute , Router} from '@angular/router';
+import { Collection } from '../../core/shared/collection.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { AuthService } from '../../core/auth/auth.service';
+
+/**
+ * Component representing the statistics page for a collection.
+ */
+@Component({
+  selector: 'ds-collection-statistics-page',
+  templateUrl: '../statistics-page/statistics-page.component.html',
+  styleUrls: ['./collection-statistics-page.component.scss']
+})
+export class CollectionStatisticsPageComponent extends StatisticsPageComponent<Collection> {
+
+  /**
+   * The report types to show on this statistics page.
+   */
+  types: string[] = [
+    'TotalVisits',
+    'TotalVisitsPerMonth',
+    'TopCountries',
+    'TopCities',
+  ];
+
+  constructor(
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected usageReportService: UsageReportService,
+    protected nameService: DSONameService,
+    protected authService: AuthService
+  ) {
+    super(
+      route,
+      router,
+      usageReportService,
+      nameService,
+      authService,
+    );
+  }
+}
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.scss b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
new file mode 100644
index 00000000000..c7f28adeff5
--- /dev/null
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
@@ -0,0 +1,112 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { of as observableOf } from 'rxjs';
+import { Community } from '../../core/shared/community.model';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { SharedModule } from '../../shared/shared.module';
+import { CommonModule } from '@angular/common';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+
+describe('CommunityStatisticsPageComponent', () => {
+
+  let component: CommunityStatisticsPageComponent;
+  let de: DebugElement;
+  let fixture: ComponentFixture<CommunityStatisticsPageComponent>;
+
+  beforeEach(async(() => {
+
+    const activatedRoute = {
+      data: observableOf({
+        scope: createSuccessfulRemoteDataObject(
+          Object.assign(new Community(), {
+            id: 'community_id',
+          })
+        )
+      })
+    };
+
+    const router = {
+    };
+
+    const usageReportService = {
+      getStatistic: (scope, type) => undefined,
+    };
+
+    spyOn(usageReportService, 'getStatistic').and.callFake(
+      (scope, type) => observableOf(
+        Object.assign(
+          new UsageReport(), {
+            id: `${scope}-${type}-report`,
+            points: [],
+          }
+        )
+      )
+    );
+
+    const nameService = {
+      getName: () => observableOf('test dso name'),
+    };
+
+    const authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      setRedirectUrl: {}
+    });
+
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        CommonModule,
+        SharedModule,
+      ],
+      declarations: [
+        CommunityStatisticsPageComponent,
+        StatisticsTableComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router, useValue: router },
+        { provide: UsageReportService, useValue: usageReportService },
+        { provide: DSpaceObjectDataService, useValue: {} },
+        { provide: DSONameService, useValue: nameService },
+        { provide: AuthService, useValue: authService },
+      ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityStatisticsPageComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should resolve to the correct community', () => {
+    expect(de.query(By.css('.header')).nativeElement.id)
+      .toEqual('community_id');
+  });
+
+  it('should show a statistics table for each usage report', () => {
+    expect(de.query(By.css('ds-statistics-table.community_id-TotalVisits-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.community_id-TotalVisitsPerMonth-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.community_id-TopCountries-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.community_id-TopCities-report')).nativeElement)
+      .toBeTruthy();
+  });
+});
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
new file mode 100644
index 00000000000..1a1c8fdf0e5
--- /dev/null
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
@@ -0,0 +1,44 @@
+import { Component } from '@angular/core';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Community } from '../../core/shared/community.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { AuthService } from '../../core/auth/auth.service';
+
+/**
+ * Component representing the statistics page for a community.
+ */
+@Component({
+  selector: 'ds-community-statistics-page',
+  templateUrl: '../statistics-page/statistics-page.component.html',
+  styleUrls: ['./community-statistics-page.component.scss']
+})
+export class CommunityStatisticsPageComponent extends StatisticsPageComponent<Community> {
+
+  /**
+   * The report types to show on this statistics page.
+   */
+  types: string[] = [
+    'TotalVisits',
+    'TotalVisitsPerMonth',
+    'TopCountries',
+    'TopCities',
+  ];
+
+  constructor(
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected usageReportService: UsageReportService,
+    protected nameService: DSONameService,
+    protected authService: AuthService,
+  ) {
+    super(
+      route,
+      router,
+      usageReportService,
+      nameService,
+      authService,
+    );
+  }
+}
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.scss b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
new file mode 100644
index 00000000000..930871e5df8
--- /dev/null
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
@@ -0,0 +1,114 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ItemStatisticsPageComponent } from './item-statistics-page.component';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { of as observableOf } from 'rxjs';
+import { Item } from '../../core/shared/item.model';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { SharedModule } from '../../shared/shared.module';
+import { CommonModule } from '@angular/common';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+
+describe('ItemStatisticsPageComponent', () => {
+
+  let component: ItemStatisticsPageComponent;
+  let de: DebugElement;
+  let fixture: ComponentFixture<ItemStatisticsPageComponent>;
+
+  beforeEach(async(() => {
+
+    const activatedRoute = {
+      data: observableOf({
+        scope: createSuccessfulRemoteDataObject(
+          Object.assign(new Item(), {
+            id: 'item_id',
+          })
+        )
+      })
+    };
+
+    const router = {
+    };
+
+    const usageReportService = {
+      getStatistic: (scope, type) => undefined,
+    };
+
+    spyOn(usageReportService, 'getStatistic').and.callFake(
+      (scope, type) => observableOf(
+        Object.assign(
+          new UsageReport(), {
+            id: `${scope}-${type}-report`,
+            points: [],
+          }
+        )
+      )
+    );
+
+    const nameService = {
+      getName: () => observableOf('test dso name'),
+    };
+
+    const authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      setRedirectUrl: {}
+    });
+
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        CommonModule,
+        SharedModule,
+      ],
+      declarations: [
+        ItemStatisticsPageComponent,
+        StatisticsTableComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router, useValue: router },
+        { provide: UsageReportService, useValue: usageReportService },
+        { provide: DSpaceObjectDataService, useValue: {} },
+        { provide: DSONameService, useValue: nameService },
+        { provide: AuthService, useValue: authService },
+      ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemStatisticsPageComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should resolve to the correct item', () => {
+    expect(de.query(By.css('.header')).nativeElement.id)
+      .toEqual('item_id');
+  });
+
+  it('should show a statistics table for each usage report', () => {
+    expect(de.query(By.css('ds-statistics-table.item_id-TotalVisits-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.item_id-TotalVisitsPerMonth-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.item_id-TotalDownloads-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.item_id-TopCountries-report')).nativeElement)
+      .toBeTruthy();
+    expect(de.query(By.css('ds-statistics-table.item_id-TopCities-report')).nativeElement)
+      .toBeTruthy();
+  });
+});
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
new file mode 100644
index 00000000000..69a8361a46f
--- /dev/null
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
@@ -0,0 +1,45 @@
+import { Component } from '@angular/core';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Item } from '../../core/shared/item.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { AuthService } from '../../core/auth/auth.service';
+
+/**
+ * Component representing the statistics page for an item.
+ */
+@Component({
+  selector: 'ds-item-statistics-page',
+  templateUrl: '../statistics-page/statistics-page.component.html',
+  styleUrls: ['./item-statistics-page.component.scss']
+})
+export class ItemStatisticsPageComponent extends StatisticsPageComponent<Item> {
+
+  /**
+   * The report types to show on this statistics page.
+   */
+  types: string[] = [
+    'TotalVisits',
+    'TotalVisitsPerMonth',
+    'TotalDownloads',
+    'TopCountries',
+    'TopCities',
+  ];
+
+  constructor(
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected usageReportService: UsageReportService,
+    protected nameService: DSONameService,
+    protected authService: AuthService
+  ) {
+    super(
+      route,
+      router,
+      usageReportService,
+      nameService,
+      authService,
+    );
+  }
+}
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.scss b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
new file mode 100644
index 00000000000..1a3babc570d
--- /dev/null
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
@@ -0,0 +1,107 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SiteStatisticsPageComponent } from './site-statistics-page.component';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { of as observableOf } from 'rxjs';
+import { Site } from '../../core/shared/site.model';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { SharedModule } from '../../shared/shared.module';
+import { CommonModule } from '@angular/common';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { SiteDataService } from '../../core/data/site-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+
+describe('SiteStatisticsPageComponent', () => {
+
+  let component: SiteStatisticsPageComponent;
+  let de: DebugElement;
+  let fixture: ComponentFixture<SiteStatisticsPageComponent>;
+
+  beforeEach(async(() => {
+
+    const activatedRoute = {
+    };
+
+    const router = {
+    };
+
+    const usageReportService = {
+      searchStatistics: () => observableOf([
+        Object.assign(
+          new UsageReport(), {
+            id: `site_id-TotalVisits-report`,
+            points: [],
+          }
+        ),
+      ]),
+    };
+
+    const nameService = {
+      getName: () => observableOf('test dso name'),
+    };
+
+    const siteService = {
+      find: () => observableOf(Object.assign(new Site(), {
+        id: 'site_id',
+        _links: {
+          self: {
+            href: 'test_site_link',
+          },
+        },
+      }))
+    };
+
+    const authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true),
+      setRedirectUrl: {}
+    });
+
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        CommonModule,
+        SharedModule,
+      ],
+      declarations: [
+        SiteStatisticsPageComponent,
+        StatisticsTableComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router, useValue: router },
+        { provide: UsageReportService, useValue: usageReportService },
+        { provide: DSpaceObjectDataService, useValue: {} },
+        { provide: DSONameService, useValue: nameService },
+        { provide: SiteDataService, useValue: siteService },
+        { provide: AuthService, useValue: authService },
+      ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SiteStatisticsPageComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should resolve to the correct site', () => {
+    expect(de.query(By.css('.header')).nativeElement.id)
+      .toEqual('site_id');
+  });
+
+  it('should show a statistics table for each usage report', () => {
+    expect(de.query(By.css('ds-statistics-table.site_id-TotalVisits-report')).nativeElement)
+      .toBeTruthy();
+  });
+});
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
new file mode 100644
index 00000000000..59f1be330c8
--- /dev/null
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
@@ -0,0 +1,56 @@
+import { Component } from '@angular/core';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
+import { SiteDataService } from '../../core/data/site-data.service';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Site } from '../../core/shared/site.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { switchMap } from 'rxjs/operators';
+import { AuthService } from '../../core/auth/auth.service';
+
+/**
+ * Component representing the site-wide statistics page.
+ */
+@Component({
+  selector: 'ds-site-statistics-page',
+  templateUrl: '../statistics-page/statistics-page.component.html',
+  styleUrls: ['./site-statistics-page.component.scss']
+})
+export class SiteStatisticsPageComponent extends StatisticsPageComponent<Site> {
+
+  /**
+   * The report types to show on this statistics page.
+   */
+  types: string[] = [
+    'TotalVisits',
+  ];
+
+  constructor(
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected usageReportService: UsageReportService,
+    protected nameService: DSONameService,
+    protected siteService: SiteDataService,
+    protected authService: AuthService,
+  ) {
+    super(
+      route,
+      router,
+      usageReportService,
+      nameService,
+      authService,
+    );
+  }
+
+  protected getScope$() {
+    return this.siteService.find();
+  }
+
+  protected getReports$() {
+    return this.scope$.pipe(
+      switchMap((scope) =>
+        this.usageReportService.searchStatistics(scope._links.self.href, 0, 10),
+      ),
+    );
+  }
+}
diff --git a/src/app/statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts
new file mode 100644
index 00000000000..44943b94d2d
--- /dev/null
+++ b/src/app/statistics-page/statistics-page-routing.module.ts
@@ -0,0 +1,81 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { StatisticsPageModule } from './statistics-page.module';
+import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
+import { ItemPageResolver } from '../+item-page/item-page.resolver';
+import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
+import { CollectionPageResolver } from '../+collection-page/collection-page.resolver';
+import { CollectionStatisticsPageComponent } from './collection-statistics-page/collection-statistics-page.component';
+import { CommunityPageResolver } from '../+community-page/community-page.resolver';
+import { CommunityStatisticsPageComponent } from './community-statistics-page/community-statistics-page.component';
+
+@NgModule({
+  imports: [
+    StatisticsPageModule,
+    RouterModule.forChild([
+        {
+          path: '',
+          resolve: {
+            breadcrumb: I18nBreadcrumbResolver
+          },
+          data: {
+            title: 'statistics.title',
+            breadcrumbKey: 'statistics'
+          },
+          children: [
+            {
+              path: '',
+              component: SiteStatisticsPageComponent,
+            },
+          ]
+        },
+        {
+          path: `items/:id`,
+          resolve: {
+            scope: ItemPageResolver,
+            breadcrumb: I18nBreadcrumbResolver
+          },
+          data: {
+            title: 'statistics.title',
+            breadcrumbKey: 'statistics'
+          },
+          component: ItemStatisticsPageComponent,
+        },
+        {
+          path: `collections/:id`,
+          resolve: {
+            scope: CollectionPageResolver,
+            breadcrumb: I18nBreadcrumbResolver
+          },
+          data: {
+            title: 'statistics.title',
+            breadcrumbKey: 'statistics'
+          },
+          component: CollectionStatisticsPageComponent,
+        },
+        {
+          path: `communities/:id`,
+          resolve: {
+            scope: CommunityPageResolver,
+            breadcrumb: I18nBreadcrumbResolver
+          },
+          data: {
+            title: 'statistics.title',
+            breadcrumbKey: 'statistics'
+          },
+          component: CommunityStatisticsPageComponent,
+        },
+      ]
+    )
+  ],
+  providers: [
+    I18nBreadcrumbResolver,
+    I18nBreadcrumbsService,
+    CollectionPageResolver,
+    CommunityPageResolver,
+  ]
+})
+export class StatisticsPageRoutingModule {
+}
diff --git a/src/app/statistics-page/statistics-page.module.ts b/src/app/statistics-page/statistics-page.module.ts
new file mode 100644
index 00000000000..068ded63aa1
--- /dev/null
+++ b/src/app/statistics-page/statistics-page.module.ts
@@ -0,0 +1,39 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { UsageReportService } from '../core/statistics/usage-report-data.service';
+import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
+import { StatisticsTableComponent } from './statistics-table/statistics-table.component';
+import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
+import { CollectionStatisticsPageComponent } from './collection-statistics-page/collection-statistics-page.component';
+import { CommunityStatisticsPageComponent } from './community-statistics-page/community-statistics-page.component';
+
+const components = [
+  StatisticsTableComponent,
+  SiteStatisticsPageComponent,
+  ItemStatisticsPageComponent,
+  CollectionStatisticsPageComponent,
+  CommunityStatisticsPageComponent,
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CoreModule.forRoot(),
+    StatisticsModule.forRoot()
+  ],
+  declarations: components,
+  providers: [
+    UsageReportService,
+  ],
+  exports: components
+})
+
+/**
+ * This module handles all components and pipes that are necessary for the search page
+ */
+export class StatisticsPageModule {
+}
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html
new file mode 100644
index 00000000000..5cf1e9c8b5f
--- /dev/null
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.html
@@ -0,0 +1,29 @@
+<div class="container">
+
+  <ng-container *ngVar="(scope$ | async) as scope">
+    <h2 *ngIf="scope"
+        class="header"
+        id="{{ scope.id }}">
+      {{ 'statistics.header' | translate: { scope: getName(scope) } }}
+    </h2>
+  </ng-container>
+
+  <ng-container *ngVar="reports$ | async as reports">
+
+    <ng-container *ngIf="!reports">
+      <ds-loading></ds-loading>
+    </ng-container>
+
+    <ng-container *ngIf="reports">
+      <ds-statistics-table *ngFor="let report of reports"
+                           [report]="report"
+                           class="m-2 {{ report.id }}">
+      </ds-statistics-table>
+      <div *ngIf="!(hasData$ | async)">
+        {{ 'statistics.page.no-data' | translate }}
+      </div>
+    </ng-container>
+
+  </ng-container>
+
+</div>
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.scss b/src/app/statistics-page/statistics-page/statistics-page.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.ts b/src/app/statistics-page/statistics-page/statistics-page.component.ts
new file mode 100644
index 00000000000..8a75895fb89
--- /dev/null
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.ts
@@ -0,0 +1,90 @@
+import { OnInit } from '@angular/core';
+import { combineLatest, Observable } from 'rxjs';
+import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { map, switchMap } from 'rxjs/operators';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { RemoteData } from '../../core/data/remote-data';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  redirectOn4xx
+} from '../../core/shared/operators';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { AuthService } from '../../core/auth/auth.service';
+
+/**
+ * Class representing an abstract statistics page component.
+ */
+export abstract class StatisticsPageComponent<T extends DSpaceObject> implements OnInit {
+
+  /**
+   * The scope dso for this statistics page, as an Observable.
+   */
+  scope$: Observable<DSpaceObject>;
+
+  /**
+   * The report types to show on this statistics page.
+   */
+  types: string[];
+
+  /**
+   * The usage report types to show on this statistics page, as an Observable list.
+   */
+  reports$: Observable<UsageReport[]>;
+
+  hasData$: Observable<boolean>;
+
+  constructor(
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected usageReportService: UsageReportService,
+    protected nameService: DSONameService,
+    protected authService: AuthService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.scope$ = this.getScope$();
+    this.reports$ = this.getReports$();
+    this.hasData$ = this.reports$.pipe(
+      map((reports) => reports.some(
+        (report) => report.points.length > 0
+      )),
+    );
+  }
+
+  /**
+   * Get the scope dso for this statistics page, as an Observable.
+   */
+  protected getScope$(): Observable<DSpaceObject> {
+    return this.route.data.pipe(
+      map((data) => data.scope as RemoteData<T>),
+      redirectOn4xx(this.router, this.authService),
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+  }
+
+  /**
+   * Get the usage reports for this statistics page, as an Observable list
+   */
+  protected getReports$(): Observable<UsageReport[]> {
+    return this.scope$.pipe(
+      switchMap((scope) =>
+        combineLatest(
+          this.types.map((type) => this.usageReportService.getStatistic(scope.id, type))
+        ),
+      ),
+    );
+  }
+
+  /**
+   * Get the name of the scope dso.
+   * @param scope the scope dso to get the name for
+   */
+  getName(scope: DSpaceObject): string {
+    return this.nameService.getName(scope);
+  }
+}
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html
new file mode 100644
index 00000000000..3ecd256812a
--- /dev/null
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.html
@@ -0,0 +1,36 @@
+<div *ngIf="hasData"
+     class="m-1">
+
+  <h3 class="m-1">
+    {{ 'statistics.table.title.' + report.reportType | translate }}
+  </h3>
+
+  <table class="table table-striped">
+
+    <tbody>
+
+    <tr>
+      <th scope="col"></th>
+      <th scope="col"
+          *ngFor="let header of headers"
+          class="{{header}}-header">
+        {{ header }}
+      </th>
+    </tr>
+
+    <tr *ngFor="let point of report.points"
+        class="{{point.id}}-data">
+      <th scope="row">
+        {{ getLabel(point) | async }}
+      </th>
+      <td *ngFor="let header of headers"
+          class="{{point.id}}-{{header}}-data">
+        {{ point.values[header] }}
+      </td>
+    </tr>
+
+    </tbody>
+
+  </table>
+
+</div>
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.scss b/src/app/statistics-page/statistics-table/statistics-table.component.scss
new file mode 100644
index 00000000000..4e173c040ab
--- /dev/null
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.scss
@@ -0,0 +1,8 @@
+th, td {
+  padding: 0.5rem;
+}
+
+td {
+  width: 50px;
+  max-width: 50px;
+}
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
new file mode 100644
index 00000000000..f22adea37d4
--- /dev/null
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
@@ -0,0 +1,98 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StatisticsTableComponent } from './statistics-table.component';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+
+describe('StatisticsTableComponent', () => {
+
+  let component: StatisticsTableComponent;
+  let de: DebugElement;
+  let fixture: ComponentFixture<StatisticsTableComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        StatisticsTableComponent,
+      ],
+      providers: [
+        { provide: DSpaceObjectDataService, useValue: {} },
+        { provide: DSONameService, useValue: {} },
+      ],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StatisticsTableComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+    component.report = Object.assign(new UsageReport(), {
+      points: [],
+    });
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('when the storage report is empty', () => {
+
+    it ('should not display a table', () => {
+      expect(de.query(By.css('table'))).toBeNull();
+    });
+  });
+
+  describe('when the storage report has data', () => {
+
+    beforeEach(() => {
+      component.report = Object.assign(new UsageReport(), {
+        points: [
+          {
+            id: 'item_1',
+            values: {
+              views: 7,
+              downloads: 4,
+            },
+          },
+          {
+            id: 'item_2',
+            values: {
+              views: 8,
+              downloads: 8,
+            },
+          }
+        ]
+      });
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it ('should display a table with the correct data', () => {
+
+      expect(de.query(By.css('table'))).toBeTruthy();
+
+      expect(de.query(By.css('th.views-header')).nativeElement.innerText)
+        .toEqual('views');
+      expect(de.query(By.css('th.downloads-header')).nativeElement.innerText)
+        .toEqual('downloads');
+
+      expect(de.query(By.css('td.item_1-views-data')).nativeElement.innerText)
+        .toEqual('7');
+      expect(de.query(By.css('td.item_1-downloads-data')).nativeElement.innerText)
+        .toEqual('4');
+      expect(de.query(By.css('td.item_2-views-data')).nativeElement.innerText)
+        .toEqual('8');
+      expect(de.query(By.css('td.item_2-downloads-data')).nativeElement.innerText)
+        .toEqual('8');
+    });
+  });
+});
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts
new file mode 100644
index 00000000000..5916adc0233
--- /dev/null
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.ts
@@ -0,0 +1,67 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Point, UsageReport } from '../../core/statistics/models/usage-report.model';
+import { Observable, of } from 'rxjs';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { map } from 'rxjs/operators';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../core/shared/operators';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+
+/**
+ * Component representing a statistics table for a given usage report.
+ */
+@Component({
+  selector: 'ds-statistics-table',
+  templateUrl: './statistics-table.component.html',
+  styleUrls: ['./statistics-table.component.scss']
+})
+export class StatisticsTableComponent implements OnInit {
+
+  /**
+   * The usage report to display a statistics table for
+   */
+  @Input()
+  report: UsageReport;
+
+  /**
+   * Boolean indicating whether the usage report has data
+   */
+  hasData: boolean;
+
+  /**
+   * The table headers
+   */
+  headers: string[];
+
+  constructor(
+    protected dsoService: DSpaceObjectDataService,
+    protected nameService: DSONameService,
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.hasData = this.report.points.length > 0;
+    if (this.hasData) {
+      this.headers = Object.keys(this.report.points[0].values);
+    }
+  }
+
+  /**
+   * Get the row label to display for a statistics point.
+   * @param point the statistics point to get the label for
+   */
+  getLabel(point: Point): Observable<string> {
+    switch (this.report.reportType) {
+      case 'TotalVisits':
+        return this.dsoService.findById(point.id).pipe(
+          getFirstSucceededRemoteData(),
+          getRemoteDataPayload(),
+          map((item) => this.nameService.getName(item)),
+        );
+      case 'TopCities':
+      case 'topCountries':
+      default:
+        return of(point.label);
+    }
+  }
+}
diff --git a/src/app/statistics/statistics-endpoint.model.ts b/src/app/statistics/statistics-endpoint.model.ts
new file mode 100644
index 00000000000..f55072b1fba
--- /dev/null
+++ b/src/app/statistics/statistics-endpoint.model.ts
@@ -0,0 +1,32 @@
+import { HALLink } from '../core/shared/hal-link.model';
+import { typedObject } from '../core/cache/builders/build-decorators';
+import { CacheableObject } from '../core/cache/object-cache.reducer';
+import { excludeFromEquals } from '../core/utilities/equals.decorators';
+import { autoserialize, deserialize } from 'cerialize';
+import { ResourceType } from '../core/shared/resource-type';
+import { STATISTICS_ENDPOINT } from './statistics-endpoint.resource-type';
+
+/**
+ * Model class for the statistics endpoint
+ */
+@typedObject
+export class StatisticsEndpoint implements CacheableObject {
+  static type = STATISTICS_ENDPOINT;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The {@link HALLink}s for the statistics endpoint
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+    searchevents: HALLink;
+    viewevents: HALLink;
+  }
+}
diff --git a/src/app/statistics/statistics-endpoint.resource-type.ts b/src/app/statistics/statistics-endpoint.resource-type.ts
new file mode 100644
index 00000000000..9ebca600f49
--- /dev/null
+++ b/src/app/statistics/statistics-endpoint.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../core/shared/resource-type';
+
+/**
+ * The resource type for the statistics endpoint
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const STATISTICS_ENDPOINT = new ResourceType('statistics');
diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts
index 58ac1f07ab3..c2c10e94cab 100644
--- a/src/app/statistics/statistics.module.ts
+++ b/src/app/statistics/statistics.module.ts
@@ -4,6 +4,14 @@ import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
 import { StatisticsService } from './statistics.service';
+import { StatisticsEndpoint } from './statistics-endpoint.model';
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const models = [
+  StatisticsEndpoint
+];
 
 @NgModule({
   imports: [
diff --git a/src/app/statistics/statistics.service.spec.ts b/src/app/statistics/statistics.service.spec.ts
index e508d25dede..2ca80f9b070 100644
--- a/src/app/statistics/statistics.service.spec.ts
+++ b/src/app/statistics/statistics.service.spec.ts
@@ -82,7 +82,7 @@ describe('StatisticsService', () => {
     const mockSearch: any = new SearchOptions({
       query: 'mock-query',
       configuration: 'mock-configuration',
-      dsoType: DSpaceObjectType.ITEM,
+      dsoTypes: [DSpaceObjectType.ITEM],
       scope: 'mock-scope'
     });
 
diff --git a/src/app/statistics/statistics.service.ts b/src/app/statistics/statistics.service.ts
index 004e013164b..20d1ebd3fe5 100644
--- a/src/app/statistics/statistics.service.ts
+++ b/src/app/statistics/statistics.service.ts
@@ -68,8 +68,8 @@ export class StatisticsService {
     if (hasValue(searchOptions.configuration)) {
       Object.assign(body, { configuration: searchOptions.configuration })
     }
-    if (hasValue(searchOptions.dsoType)) {
-      Object.assign(body, { dsoType: searchOptions.dsoType.toLowerCase() })
+    if (isNotEmpty(searchOptions.dsoTypes)) {
+      Object.assign(body, { dsoType: searchOptions.dsoTypes[0].toLowerCase()  })
     }
     if (hasValue(searchOptions.scope)) {
       Object.assign(body, { scope: searchOptions.scope })
diff --git a/src/app/submission/edit/submission-edit.component.html b/src/app/submission/edit/submission-edit.component.html
index dcd8d84edc3..19bcd6f0799 100644
--- a/src/app/submission/edit/submission-edit.component.html
+++ b/src/app/submission/edit/submission-edit.component.html
@@ -3,5 +3,6 @@
                       [sections]="sections"
                       [selfUrl]="selfUrl"
                       [submissionDefinition]="submissionDefinition"
+                      [item]="item"
                       [submissionId]="submissionId"></ds-submission-form>
 </div>
diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts
index 908f473136b..7908a052b78 100644
--- a/src/app/submission/edit/submission-edit.component.ts
+++ b/src/app/submission/edit/submission-edit.component.ts
@@ -13,6 +13,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { Collection } from '../../core/shared/collection.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
 
 /**
  * This component allows to edit an existing workspaceitem/workflowitem.
@@ -59,6 +60,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
    * @type {Array}
    */
   private subs: Subscription[] = [];
+  public item: Item;
 
   /**
    * Initialize instance variables
@@ -96,11 +98,12 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
           this.collectionId = (submissionObjectRD.payload.collection as Collection).id;
           this.selfUrl = submissionObjectRD.payload._links.self.href;
           this.sections = submissionObjectRD.payload.sections;
+          this.item = submissionObjectRD.payload.item as Item;
           this.submissionDefinition = (submissionObjectRD.payload.submissionDefinition as SubmissionDefinitionsModel);
           this.changeDetectorRef.detectChanges();
         }
       } else {
-        if (submissionObjectRD.error.statusCode === 404) {
+        if (submissionObjectRD.statusCode === 404) {
           // redirect to not found page
           this.router.navigate(['/404'], { skipLocationChange: true });
         }
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 6f4a8a864ce..d897cc31fd3 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -1,5 +1,20 @@
 <div>
-  <div ngbDropdown #collectionControls="ngbDropdown" class="btn-group input-group" (openChange)="toggled($event)">
+  <div
+    *ngIf="!(available$ | async)"
+    class="input-group mb-3">
+    <div class="input-group-prepend">
+      <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
+    </div>
+    <div class="input-group-append">
+      <span class="input-group-text">{{ selectedCollectionName$ | async }}</span>
+    </div>
+  </div>
+  <div
+    ngbDropdown
+    #collectionControls="ngbDropdown"
+    *ngIf="(available$ | async)"
+    class="btn-group input-group"
+    (openChange)="toggled($event)">
     <div class="input-group-prepend">
       <span id="collectionControlsMenuLabel" class="input-group-text">
         {{ 'submission.sections.general.collection' | translate }}
@@ -10,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(disabled$ | async) || (processingChange$ | async)"
+            [disabled]="(processingChange$ | async)"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="!(processingChange$ | async)">{{ selectedCollectionName$ | async }}</span>
@@ -20,31 +35,9 @@
          class="dropdown-menu"
          id="collectionControlsDropdownMenu"
          aria-labelledby="collectionControlsMenuButton">
-      <div class="form-group w-100 pr-2 pl-2">
-        <input *ngIf="searchField"
-               type="search"
-               class="form-control w-100"
-               (click)="$event.stopPropagation();"
-               placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
-               [formControl]="searchField">
-      </div>
-      <div class="dropdown-divider"></div>
-      <div class="scrollable-menu" aria-labelledby="dropdownMenuButton" (scroll)="onScroll($event)">
-        <button class="dropdown-item disabled" *ngIf="(searchListCollection$ | async)?.length == 0">
-          {{'submission.sections.general.no-collection' | translate}}
-        </button>
-        <button *ngFor="let listItem of (searchListCollection$ | async)"
-                class="dropdown-item collection-item"
-                title="{{ listItem.collection.name }}"
-                (click)="onSelect(listItem)">
-          <ul class="list-unstyled mb-0">
-            <li class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
-              {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
-            </li>
-            <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</li>
-          </ul>
-        </button>
-      </div>
+      <ds-collection-dropdown
+        (selectionChange)="onSelect($event)">
+      </ds-collection-dropdown>
     </div>
   </div>
 </div>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 105d94b9665..0132289266c 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -1,14 +1,11 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement, SimpleChange } from '@angular/core';
+import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
 import { async, ComponentFixture, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-import { of as observableOf } from 'rxjs';
-import { filter } from 'rxjs/operators';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
-import { cold } from 'jasmine-marbles';
 
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { mockSubmissionId, mockSubmissionRestResponse } from '../../../shared/mocks/submission.mock';
@@ -19,172 +16,13 @@ import { SubmissionJsonPatchOperationsService } from '../../../core/submission/s
 import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Community } from '../../../core/shared/community.model';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { Collection } from '../../../core/shared/collection.model';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-
-const subcommunities = [Object.assign(new Community(), {
-  name: 'SubCommunity 1',
-  id: '123456789-1',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'SubCommunity 1'
-    }]
-}),
-  Object.assign(new Community(), {
-    name: 'SubCommunity 1',
-    id: '123456789s-1',
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'SubCommunity 1'
-      }]
-  })
-];
-
-const mockCommunity1Collection1 = Object.assign(new Collection(), {
-  name: 'Community 1-Collection 1',
-  id: '1234567890-1',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 1-Collection 1'
-    }]
-});
-
-const mockCommunity1Collection2 = Object.assign(new Collection(), {
-  name: 'Community 1-Collection 2',
-  id: '1234567890-2',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 1-Collection 2'
-    }]
-});
-
-const mockCommunity2Collection1 = Object.assign(new Collection(), {
-  name: 'Community 2-Collection 1',
-  id: '1234567890-3',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 2-Collection 1'
-    }]
-});
-
-const mockCommunity2Collection2 = Object.assign(new Collection(), {
-  name: 'Community 2-Collection 2',
-  id: '1234567890-4',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 2-Collection 2'
-    }]
-});
-
-const mockCommunity = Object.assign(new Community(), {
-  name: 'Community 1',
-  id: '123456789-1',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 1'
-    }],
-  collections: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), [mockCommunity1Collection1, mockCommunity1Collection2]))),
-  subcommunities: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), subcommunities))),
-});
-
-const mockCommunity2 = Object.assign(new Community(), {
-  name: 'Community 2',
-  id: '123456789-2',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 2'
-    }],
-  collections: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), [mockCommunity2Collection1, mockCommunity2Collection2]))),
-  subcommunities: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), []))),
-});
-
-const mockCommunity1Collection1Rd = observableOf(new RemoteData(true, true, true,
-  undefined, mockCommunity1Collection1));
-
-const mockCommunityList = observableOf(new RemoteData(true, true, true,
-  undefined, new PaginatedList(new PageInfo(), [mockCommunity, mockCommunity2])));
-
-const mockCommunityCollectionList = observableOf(new RemoteData(true, true, true,
-  undefined, new PaginatedList(new PageInfo(), [mockCommunity1Collection1, mockCommunity1Collection2])));
-
-const mockCommunity2CollectionList = observableOf(new RemoteData(true, true, true,
-  undefined, new PaginatedList(new PageInfo(), [mockCommunity2Collection1, mockCommunity2Collection2])));
-
-const mockCollectionList = [
-  {
-    communities: [
-      {
-        id: '123456789-1',
-        name: 'Community 1'
-      }
-    ],
-    collection: {
-      id: '1234567890-1',
-      name: 'Community 1-Collection 1'
-    }
-  },
-  {
-    communities: [
-      {
-        id: '123456789-1',
-        name: 'Community 1'
-      }
-    ],
-    collection: {
-      id: '1234567890-2',
-      name: 'Community 1-Collection 2'
-    }
-  },
-  {
-    communities: [
-      {
-        id: '123456789-2',
-        name: 'Community 2'
-      }
-    ],
-    collection: {
-      id: '1234567890-3',
-      name: 'Community 2-Collection 1'
-    }
-  },
-  {
-    communities: [
-      {
-        id: '123456789-2',
-        name: 'Community 2'
-      }
-    ],
-    collection: {
-      id: '1234567890-4',
-      name: 'Community 2-Collection 2'
-    }
-  }
-];
+import { hot, cold } from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { SectionsService } from '../../sections/sections.service';
+import { componentFactoryName } from '@angular/compiler';
+import { Collection } from 'src/app/core/shared/collection.model';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -198,7 +36,57 @@ describe('SubmissionFormCollectionComponent Component', () => {
   const collectionId = '1234567890-1';
   const definition = 'traditional';
   const submissionRestResponse = mockSubmissionRestResponse;
-  const searchedCollection = 'Community 2-Collection 2';
+
+  const mockCollectionList = [
+    {
+      communities: [
+        {
+          id: '123456789-1',
+          name: 'Community 1'
+        }
+      ],
+      collection: {
+        id: '1234567890-1',
+        name: 'Community 1-Collection 1'
+      }
+    },
+    {
+      communities: [
+        {
+          id: '123456789-1',
+          name: 'Community 1'
+        }
+      ],
+      collection: {
+        id: '1234567890-2',
+        name: 'Community 1-Collection 2'
+      }
+    },
+    {
+      communities: [
+        {
+          id: '123456789-2',
+          name: 'Community 2'
+        }
+      ],
+      collection: {
+        id: '1234567890-3',
+        name: 'Community 2-Collection 1'
+      }
+    },
+    {
+      communities: [
+        {
+          id: '123456789-2',
+          name: 'Community 2'
+        }
+      ],
+      collection: {
+        id: '1234567890-4',
+        name: 'Community 2-Collection 2'
+      }
+    }
+  ];
 
   const communityDataService: any = jasmine.createSpyObj('communityDataService', {
     findAll: jasmine.createSpy('findAll')
@@ -217,6 +105,10 @@ describe('SubmissionFormCollectionComponent Component', () => {
     replace: jasmine.createSpy('replace')
   });
 
+  const sectionsService: any = jasmine.createSpyObj('sectionsService', {
+    isSectionAvailable: of(true)
+  });
+
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -236,6 +128,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         { provide: CommunityDataService, useValue: communityDataService },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
         { provide: Store, useValue: store },
+        { provide: SectionsService, useValue: sectionsService },
         ChangeDetectorRef,
         SubmissionFormCollectionComponent
       ],
@@ -299,72 +192,11 @@ describe('SubmissionFormCollectionComponent Component', () => {
       expect(compAsAny.pathCombiner).toEqual(expected);
     });
 
-    it('should init collection list properly', () => {
-      communityDataService.findAll.and.returnValue(mockCommunityList);
-      collectionDataService.findById.and.returnValue(mockCommunity1Collection1Rd);
-      collectionDataService.getAuthorizedCollectionByCommunity.and.returnValues(mockCommunityCollectionList, mockCommunity2CollectionList);
-
-      comp.ngOnChanges({
-        currentCollectionId: new SimpleChange(null, collectionId, true)
-      });
-
-      expect(comp.searchListCollection$).toBeObservable(cold('(ab)', {
-        a: [],
-        b: mockCollectionList
-      }));
-
-      expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
-        a: 'Community 1-Collection 1'
-      }));
-    });
-
-    it('should show only the searched collection', () => {
-      comp.searchListCollection$ = observableOf(mockCollectionList);
-      fixture.detectChanges();
-
-      comp.searchField.setValue(searchedCollection);
-      fixture.detectChanges();
-
-      comp.searchListCollection$.pipe(
-        filter(() => !comp.disabled$.getValue())
-      ).subscribe((list) => {
-        expect(list).toEqual([mockCollectionList[3]]);
-      });
-
-    });
-
-    it('should emit collectionChange event when selecting a new collection', () => {
-      spyOn(comp.searchField, 'reset').and.callThrough();
-      spyOn(comp.collectionChange, 'emit').and.callThrough();
-      jsonPatchOpServiceStub.jsonPatchByResourceID.and.returnValue(observableOf(submissionRestResponse));
-      comp.ngOnInit();
-      comp.onSelect(mockCollectionList[1]);
-      fixture.detectChanges();
-
-      expect(comp.searchField.reset).toHaveBeenCalled();
-      expect(comp.collectionChange.emit).toHaveBeenCalledWith(submissionRestResponse[0] as any);
-      expect(submissionServiceStub.changeSubmissionCollection).toHaveBeenCalled();
-      expect(comp.selectedCollectionId).toBe(mockCollectionList[1].collection.id);
-      expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
-        a: mockCollectionList[1].collection.name
-      }));
-
-    });
-
-    it('should reset searchField when dropdown menu has been closed', () => {
-      spyOn(comp.searchField, 'reset').and.callThrough();
-      comp.toggled(false);
-
-      expect(comp.searchField.reset).toHaveBeenCalled();
-    });
-
     describe('', () => {
       let dropdowBtn: DebugElement;
       let dropdownMenu: DebugElement;
 
       beforeEach(() => {
-
-        comp.searchListCollection$ = observableOf(mockCollectionList);
         fixture.detectChanges();
         dropdowBtn = fixture.debugElement.query(By.css('#collectionControlsMenuButton'));
         dropdownMenu = fixture.debugElement.query(By.css('#collectionControlsDropdownMenu'));
@@ -387,49 +219,46 @@ describe('SubmissionFormCollectionComponent Component', () => {
         fixture.whenStable().then(() => {
           expect(comp.onClose).toHaveBeenCalled();
           expect(dropdownMenu.nativeElement.classList).toContain('show');
-          expect(dropdownMenu.queryAll(By.css('.collection-item')).length).toBe(4);
         });
       }));
 
-      it('should trigger onSelect method when select a new collection from dropdown menu', fakeAsync(() => {
-
-        spyOn(comp, 'onSelect');
-        dropdowBtn.triggerEventHandler('click', null);
-        tick();
-        fixture.detectChanges();
+      it('the dropdown menu should be enable', () => {
+        const dropDown = fixture.debugElement.query(By.css('#collectionControlsDropdownMenu'));
+        expect(dropDown).toBeTruthy();
+      });
 
-        const secondLink: DebugElement = dropdownMenu.query(By.css('.collection-item:nth-child(2)'));
-        secondLink.triggerEventHandler('click', null);
-        tick();
+      it('the dropdown menu should be disabled', () => {
+        comp.available$ = of(false);
         fixture.detectChanges();
+        const dropDown = fixture.debugElement.query(By.css('#collectionControlsDropdownMenu'));
+        expect(dropDown).toBeFalsy();
+      });
 
-        fixture.whenStable().then(() => {
-
-          expect(comp.onSelect).toHaveBeenCalled();
-        });
-      }));
+      it('should be simulated when the drop-down menu is closed', () => {
+        spyOn(comp, 'onClose');
+        comp.onClose();
+        expect(comp.onClose).toHaveBeenCalled();
+      });
 
-      it('should update searchField on input type', fakeAsync(() => {
+      it('should be simulated when the drop-down menu is toggled', () => {
+        spyOn(comp, 'toggled');
+        comp.toggled(false);
+        expect(comp.toggled).toHaveBeenCalled();
+      });
 
-        dropdowBtn.triggerEventHandler('click', null);
-        tick();
+      it('should ', () => {
+        spyOn(comp.collectionChange, 'emit').and.callThrough();
+        jsonPatchOpServiceStub.jsonPatchByResourceID.and.returnValue(of(submissionRestResponse));
+        comp.ngOnInit();
+        comp.onSelect(mockCollectionList[1]);
         fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          const input = fixture.debugElement.query(By.css('input.form-control'));
-          const el = input.nativeElement;
-
-          expect(el.value).toBe('');
-
-          el.value = searchedCollection;
-          el.dispatchEvent(new Event('input'));
-
-          fixture.detectChanges();
-
-          expect(fixture.componentInstance.searchField.value).toEqual(searchedCollection);
-        });
-      }));
-
+        expect(submissionServiceStub.changeSubmissionCollection).toHaveBeenCalled();
+        expect(comp.selectedCollectionId).toBe(mockCollectionList[1].collection.id);
+        expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
+          a: mockCollectionList[1].collection.name
+        }));
+      });
     });
 
   });
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index f84764d6a4b..aa1bf9cb0a4 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -2,57 +2,31 @@ import {
   ChangeDetectorRef,
   Component,
   EventEmitter,
-  HostListener,
   Input,
   OnChanges,
   OnInit,
   Output,
-  SimpleChanges
+  SimpleChanges,
+  ViewChild
 } from '@angular/core';
-import { FormControl } from '@angular/forms';
 
-import { BehaviorSubject, combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
 import {
-  debounceTime,
-  distinctUntilChanged,
-  filter,
   find,
-  flatMap,
-  map,
-  mergeMap,
-  reduce,
-  startWith
+  map
 } from 'rxjs/operators';
 
 import { Collection } from '../../../core/shared/collection.model';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { Community } from '../../../core/shared/community.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { PaginatedList } from '../../../core/data/paginated-list';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { FindListOptions } from '../../../core/data/request.models';
-
-/**
- * An interface to represent a collection entry
- */
-interface CollectionListEntryItem {
-  id: string;
-  name: string;
-}
-
-/**
- * An interface to represent an entry in the collection list
- */
-interface CollectionListEntry {
-  communities: CollectionListEntryItem[],
-  collection: CollectionListEntryItem
-}
+import { CollectionDropdownComponent } from 'src/app/shared/collection-dropdown/collection-dropdown.component';
+import { SectionsService } from '../../sections/sections.service';
 
 /**
  * This component allows to show the current collection the submission belonging to and to change it.
@@ -88,30 +62,12 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   @Output() collectionChange: EventEmitter<SubmissionObject> = new EventEmitter<SubmissionObject>();
 
-  /**
-   * A boolean representing if this dropdown button is disabled
-   * @type {BehaviorSubject<boolean>}
-   */
-  public disabled$ = new BehaviorSubject<boolean>(true);
-
   /**
    * A boolean representing if a collection change operation is processing
    * @type {BehaviorSubject<boolean>}
    */
   public processingChange$ = new BehaviorSubject<boolean>(false);
 
-  /**
-   * The search form control
-   * @type {FormControl}
-   */
-  public searchField: FormControl = new FormControl();
-
-  /**
-   * The collection list obtained from a search
-   * @type {Observable<CollectionListEntry[]>}
-   */
-  public searchListCollection$: Observable<CollectionListEntry[]>;
-
   /**
    * The selected collection id
    * @type {string}
@@ -131,22 +87,21 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
   protected pathCombiner: JsonPatchOperationPathCombiner;
 
   /**
-   * A boolean representing if dropdown list is scrollable to the bottom
-   * @type {boolean}
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
    */
-  private scrollableBottom = false;
+  private subs: Subscription[] = [];
 
   /**
-   * A boolean representing if dropdown list is scrollable to the top
-   * @type {boolean}
+   * The html child that contains the collections list
    */
-  private scrollableTop = false;
+  @ViewChild(CollectionDropdownComponent, {static: false}) collectionDropdown: CollectionDropdownComponent;
 
   /**
-   * Array to track all subscriptions and unsubscribe them onDestroy
-   * @type {Array}
+   * A boolean representing if the collection section is available
+   * @type {BehaviorSubject<boolean>}
    */
-  private subs: Subscription[] = [];
+  available$: Observable<boolean>;
 
   /**
    * Initialize instance variables
@@ -159,37 +114,11 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    * @param {SubmissionService} submissionService
    */
   constructor(protected cdr: ChangeDetectorRef,
-              private communityDataService: CommunityDataService,
               private collectionDataService: CollectionDataService,
               private operationsBuilder: JsonPatchOperationsBuilder,
               private operationsService: SubmissionJsonPatchOperationsService,
-              private submissionService: SubmissionService) {
-  }
-
-  /**
-   * Method called on mousewheel event, it prevent the page scroll
-   * when arriving at the top/bottom of dropdown menu
-   *
-   * @param event
-   *     mousewheel event
-   */
-  @HostListener('mousewheel', ['$event']) onMousewheel(event) {
-    if (event.wheelDelta > 0 && this.scrollableTop) {
-      event.preventDefault();
-    }
-    if (event.wheelDelta < 0 && this.scrollableBottom) {
-      event.preventDefault();
-    }
-  }
-
-  /**
-   * Check if dropdown scrollbar is at the top or bottom of the dropdown list
-   *
-   * @param event
-   */
-  onScroll(event) {
-    this.scrollableBottom = (event.target.scrollTop + event.target.clientHeight === event.target.scrollHeight);
-    this.scrollableTop = (event.target.scrollTop === 0);
+              private submissionService: SubmissionService,
+              private sectionsService: SectionsService) {
   }
 
   /**
@@ -204,51 +133,6 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
         find((collectionRD: RemoteData<Collection>) => isNotEmpty(collectionRD.payload)),
         map((collectionRD: RemoteData<Collection>) => collectionRD.payload.name)
       );
-
-      const findOptions: FindListOptions = {
-        elementsPerPage: 1000
-      };
-
-      // Retrieve collection list only when is the first change
-      if (changes.currentCollectionId.isFirstChange()) {
-        // @TODO replace with search/top browse endpoint
-        // @TODO implement community/subcommunity hierarchy
-        const communities$ = this.communityDataService.findAll(findOptions).pipe(
-          find((communities: RemoteData<PaginatedList<Community>>) => isNotEmpty(communities.payload)),
-          mergeMap((communities: RemoteData<PaginatedList<Community>>) => communities.payload.page));
-
-        const listCollection$ = communities$.pipe(
-          flatMap((communityData: Community) => {
-            return this.collectionDataService.getAuthorizedCollectionByCommunity(communityData.uuid, findOptions).pipe(
-              find((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending && collections.hasSucceeded),
-              mergeMap((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.page),
-              filter((collectionData: Collection) => isNotEmpty(collectionData)),
-              map((collectionData: Collection) => ({
-                communities: [{ id: communityData.id, name: communityData.name }],
-                collection: { id: collectionData.id, name: collectionData.name }
-              }))
-            );
-          }),
-          reduce((acc: any, value: any) => [...acc, ...value], []),
-          startWith([])
-        );
-
-        const searchTerm$ = this.searchField.valueChanges.pipe(
-          debounceTime(200),
-          distinctUntilChanged(),
-          startWith('')
-        );
-
-        this.searchListCollection$ = combineLatest(searchTerm$, listCollection$).pipe(
-          map(([searchTerm, listCollection]) => {
-            this.disabled$.next(isEmpty(listCollection));
-            if (isEmpty(searchTerm)) {
-              return listCollection;
-            } else {
-              return listCollection.filter((v) => v.collection.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1).slice(0, 5);
-            }
-          }));
-      }
     }
   }
 
@@ -257,6 +141,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   ngOnInit() {
     this.pathCombiner = new JsonPatchOperationPathCombiner('sections', 'collection');
+    this.available$ = this.sectionsService.isSectionAvailable(this.submissionId, 'collection');
   }
 
   /**
@@ -273,7 +158,6 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    *    the selected [CollectionListEntryItem]
    */
   onSelect(event) {
-    this.searchField.reset();
     this.processingChange$.next(true);
     this.operationsBuilder.replace(this.pathCombiner.getPath(), event.collection.id, true);
     this.subs.push(this.operationsService.jsonPatchByResourceID(
@@ -296,7 +180,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    * Reset search form control on dropdown menu close
    */
   onClose() {
-    this.searchField.reset();
+    this.collectionDropdown.reset();
   }
 
   /**
@@ -307,7 +191,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   toggled(isOpen: boolean) {
     if (!isOpen) {
-      this.searchField.reset();
+      this.collectionDropdown.reset();
     }
   }
 }
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index 938c81a33f0..459241ae1c4 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -12,7 +12,7 @@
     <button type="button"
             class="btn btn-info"
             id="save"
-            [disabled]="(processingSaveStatus | async)"
+            [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
             (click)="save($event)">
       <span>{{'submission.general.save' | translate}}</span>
     </button>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index d9d58aa4f2d..704346f4453 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -169,7 +169,7 @@ describe('SubmissionFormFooterComponent Component', () => {
       comp.save(null);
       fixture.detectChanges();
 
-      expect(submissionServiceStub.dispatchSave).toHaveBeenCalledWith(submissionId);
+      expect(submissionServiceStub.dispatchSave).toHaveBeenCalledWith(submissionId, true);
     });
 
     it('should call dispatchSaveForLater on save for later', () => {
@@ -224,6 +224,22 @@ describe('SubmissionFormFooterComponent Component', () => {
       expect(depositBtn.nativeElement.disabled).toBeFalsy();
     });
 
+    it('should disable save button when all modifications had been saved', () => {
+      comp.hasUnsavedModification = observableOf(false);
+      fixture.detectChanges();
+
+      const saveBtn: any = fixture.debugElement.query(By.css('#save'));
+      expect(saveBtn.nativeElement.disabled).toBeTruthy();
+    });
+
+    it('should enable save button when there are not saved modifications', () => {
+      comp.hasUnsavedModification = observableOf(true);
+      fixture.detectChanges();
+
+      const saveBtn: any = fixture.debugElement.query(By.css('#save'));
+      expect(saveBtn.nativeElement.disabled).toBeFalsy();
+    });
+
   });
 });
 
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index 1b885b98b86..9cabdcbf6d6 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -49,6 +49,11 @@ export class SubmissionFormFooterComponent implements OnChanges {
    */
   public submissionIsInvalid: Observable<boolean> = observableOf(true);
 
+  /**
+   * A boolean representing if submission form has unsaved modifications
+   */
+  public hasUnsavedModification: Observable<boolean>;
+
   /**
    * Initialize instance variables
    *
@@ -73,6 +78,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
       this.processingSaveStatus = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
       this.processingDepositStatus = this.submissionService.getSubmissionDepositProcessingStatus(this.submissionId);
       this.showDepositAndDiscard = observableOf(this.submissionService.getSubmissionScope() === SubmissionScopeType.WorkspaceItem);
+      this.hasUnsavedModification = this.submissionService.hasUnsavedModification();
     }
   }
 
@@ -80,7 +86,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
    * Dispatch a submission save action
    */
   save(event) {
-    this.submissionService.dispatchSave(this.submissionId);
+    this.submissionService.dispatchSave(this.submissionId, true);
   }
 
   /**
diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts
index ab5d3ad5083..cebc12c987e 100644
--- a/src/app/submission/form/submission-form.component.spec.ts
+++ b/src/app/submission/form/submission-form.component.spec.ts
@@ -20,6 +20,7 @@ import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { AuthService } from '../../core/auth/auth.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createTestComponent } from '../../shared/testing/utils.test';
+import { Item } from '../../core/shared/item.model';
 
 describe('SubmissionFormComponent Component', () => {
 
@@ -66,7 +67,7 @@ describe('SubmissionFormComponent Component', () => {
         <ds-submission-form [collectionId]="collectionId"
                                    [selfUrl]="selfUrl"
                                    [submissionDefinition]="submissionDefinition"
-                                   [submissionId]="submissionId"></ds-submission-form>`;
+                                   [submissionId]="submissionId" [item]="item"></ds-submission-form>`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
@@ -118,6 +119,7 @@ describe('SubmissionFormComponent Component', () => {
       comp.submissionDefinition = submissionDefinition;
       comp.selfUrl = selfUrl;
       comp.sections = sectionsData;
+      comp.item = new Item();
 
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
       submissionServiceStub.getSubmissionSections.and.returnValue(observableOf(sectionsList));
@@ -143,6 +145,7 @@ describe('SubmissionFormComponent Component', () => {
         selfUrl,
         submissionDefinition,
         sectionsData,
+        comp.item,
         null);
       expect(submissionServiceStub.startAutoSave).toHaveBeenCalled();
     });
@@ -153,6 +156,7 @@ describe('SubmissionFormComponent Component', () => {
       comp.submissionDefinition = submissionDefinition;
       comp.selfUrl = selfUrl;
       comp.sections = sectionsData;
+      comp.item = new Item();
 
       comp.onCollectionChange(submissionObjectNew);
 
@@ -168,7 +172,9 @@ describe('SubmissionFormComponent Component', () => {
         submissionId,
         selfUrl,
         submissionObjectNew.submissionDefinition,
-        submissionObjectNew.sections);
+        submissionObjectNew.sections,
+        comp.item,
+      );
     });
 
     it('should update only collection id on collection change when submission definition is not changed', () => {
@@ -178,6 +184,7 @@ describe('SubmissionFormComponent Component', () => {
       comp.submissionDefinition = submissionDefinition;
       comp.selfUrl = selfUrl;
       comp.sections = sectionsData;
+      comp.item = new Item();
 
       comp.onCollectionChange({
         collection: {
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 0b8cfce6191..9aed2da792b 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -14,6 +14,7 @@ import { UploaderOptions } from '../../shared/uploader/uploader-options.model';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
 import { SectionDataObject } from '../sections/models/section-data.model';
 import { SubmissionService } from '../submission.service';
+import { Item } from '../../core/shared/item.model';
 
 /**
  * This component represents the submission form.
@@ -30,6 +31,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
    * @type {string}
    */
   @Input() collectionId: string;
+  @Input() item: Item;
 
   /**
    * The list of submission's sections
@@ -150,6 +152,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
               this.selfUrl,
               this.submissionDefinition,
               this.sections,
+              this.item,
               null);
             this.changeDetectorRef.detectChanges();
           })
@@ -191,7 +194,8 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
         this.submissionId,
         submissionObject._links.self.href,
         this.submissionDefinition,
-        this.sections);
+        this.sections,
+        this.item);
     } else {
       this.changeDetectorRef.detectChanges();
     }
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
new file mode 100644
index 00000000000..73b41378c8c
--- /dev/null
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.create.collection.head' | translate}}
+    <button type="button" class="close" (click)="closeCollectionModal()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <ds-collection-dropdown (selectionChange)="selectObject($event)">
+    </ds-collection-dropdown>
+  </div>
+</div>
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
new file mode 100644
index 00000000000..1a70081367a
--- /dev/null
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
@@ -0,0 +1,3 @@
+.close:focus {
+  outline: none !important;
+}
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
new file mode 100644
index 00000000000..5002c4f94ab
--- /dev/null
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
@@ -0,0 +1,89 @@
+import { Component, NO_ERRORS_SCHEMA, EventEmitter } from '@angular/core';
+import { async, TestBed, ComponentFixture, inject } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionImportExternalCollectionComponent } from './submission-import-external-collection.component';
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+describe('SubmissionImportExternalCollectionComponent test suite', () => {
+  let comp: SubmissionImportExternalCollectionComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionImportExternalCollectionComponent>;
+
+  beforeEach(async (() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionImportExternalCollectionComponent,
+        TestComponent,
+      ],
+      providers: [
+        NgbActiveModal,
+        SubmissionImportExternalCollectionComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-submission-import-external-collection></ds-submission-import-external-collection>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionImportExternalCollectionComponent', inject([SubmissionImportExternalCollectionComponent], (app: SubmissionImportExternalCollectionComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionImportExternalCollectionComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it('The variable \'selectedEvent\' should be assigned', () => {
+      const event = new EventEmitter<CollectionListEntry>();
+      comp.selectObject(event);
+
+      expect(comp.selectedEvent).toEqual(event);
+    });
+
+    it('The variable \'selectedEvent\' should be assigned', () => {
+      spyOn(compAsAny.activeModal, 'dismiss');
+      comp.closeCollectionModal();
+
+      expect(compAsAny.activeModal.dismiss).toHaveBeenCalled();
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
new file mode 100644
index 00000000000..cbac0cb710d
--- /dev/null
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
@@ -0,0 +1,40 @@
+import { Component, Output, EventEmitter } from '@angular/core';
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+/**
+ * Wrap component for 'ds-collection-dropdown'.
+ */
+@Component({
+  selector: 'ds-submission-import-external-collection',
+  styleUrls: ['./submission-import-external-collection.component.scss'],
+  templateUrl: './submission-import-external-collection.component.html'
+})
+export class SubmissionImportExternalCollectionComponent {
+  /**
+   * The event passed by 'ds-collection-dropdown'.
+   */
+  @Output() public selectedEvent = new EventEmitter<CollectionListEntry>();
+
+  /**
+   * Initialize the component variables.
+   * @param {NgbActiveModal} activeModal
+   */
+  constructor(
+    private activeModal: NgbActiveModal
+  ) { }
+
+  /**
+   * This method populates the 'selectedEvent' variable.
+   */
+  public selectObject(event): void {
+    this.selectedEvent.emit(event);
+  }
+
+  /**
+   * This method closes the modal.
+   */
+  public closeCollectionModal(): void {
+    this.activeModal.dismiss(false);
+  }
+}
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
new file mode 100644
index 00000000000..83c1ed82b62
--- /dev/null
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -0,0 +1,39 @@
+<div class="modal-header">
+  <h2>{{'submission.import-external.preview.title' | translate}}</h2>
+  <button type="button" class="close"
+          (click)="closeMetadataModal()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+  </button>
+</div>
+<div class="modal-body">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
+        <p>{{'submission.import-external.preview.subtitle' | translate}}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12">
+        <hr>
+      </div>
+    </div>
+    <div *ngFor="let metadata of metadataList" class="row">
+      <div class="col-md-12">
+        <strong>{{'item.preview.' + metadata.key | translate}}</strong>
+        <p>{{metadata.value.value}}</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12">
+        <hr>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12 text-right">
+        <button class="btn btn-success" (click)="import()" role="button">
+          <i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
new file mode 100644
index 00000000000..1a70081367a
--- /dev/null
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
@@ -0,0 +1,3 @@
+.close:focus {
+  outline: none !important;
+}
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
new file mode 100644
index 00000000000..aaa6887870b
--- /dev/null
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
@@ -0,0 +1,165 @@
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TestScheduler } from 'rxjs/testing';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { getTestScheduler } from 'jasmine-marbles';
+import { SubmissionImportExternalPreviewComponent } from './submission-import-external-preview.component';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { SubmissionService } from '../../submission.service';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model';
+import { Metadata } from '../../../core/shared/metadata.utils';
+import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+
+describe('SubmissionImportExternalPreviewComponent test suite', () => {
+  let comp: SubmissionImportExternalPreviewComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionImportExternalPreviewComponent>;
+  let submissionServiceStub: SubmissionServiceStub;
+  let scheduler: TestScheduler;
+  const ngbActiveModal = jasmine.createSpyObj('modal', ['close', 'dismiss']);
+  const ngbModal = jasmine.createSpyObj('modal', ['open']);
+  const externalEntry = Object.assign(new ExternalSourceEntry(), {
+    id: '0001-0001-0001-0001',
+    display: 'John Doe',
+    value: 'John, Doe',
+    metadata: {
+      'dc.identifier.uri': [
+        {
+          value: 'https://orcid.org/0001-0001-0001-0001'
+        }
+      ]
+    },
+    _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } }
+  });
+
+  beforeEach(async(() => {
+    scheduler = getTestScheduler();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        SubmissionImportExternalPreviewComponent,
+        TestComponent
+      ],
+      providers: [
+        { provide: Router, useValue: new RouterStub() },
+        { provide: SubmissionService, useValue: new SubmissionServiceStub() },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: NgbModal, useValue: ngbModal },
+        { provide: NgbActiveModal, useValue: ngbActiveModal },
+        SubmissionImportExternalPreviewComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-submission-import-external-preview></ds-submission-import-external-preview>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionImportExternalPreviewComponent', inject([SubmissionImportExternalPreviewComponent], (app: SubmissionImportExternalPreviewComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionImportExternalPreviewComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      submissionServiceStub = TestBed.get(SubmissionService);
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it('Should init component properly', () => {
+      comp.externalSourceEntry = externalEntry;
+      const expected = [
+        { key: 'dc.identifier.uri', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') }
+      ];
+      fixture.detectChanges();
+
+      expect(comp.metadataList).toEqual(expected);
+    });
+
+    it('Should close the modal calling \'activeModal.dismiss\'', () => {
+      comp.modalRef = jasmine.createSpyObj('modal', ['close', 'dismiss']);
+      comp.closeMetadataModal();
+
+      expect(compAsAny.activeModal.dismiss).toHaveBeenCalled();
+    });
+
+    it('Should start the import process opening a modal', (done) => {
+      const emittedEvent: CollectionListEntry = {
+        communities: [
+          {
+            id: 'dummy',
+            uuid: 'dummy',
+            name: 'dummy',
+          }
+        ],
+        collection: {
+          id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+          uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+          name: 'Collection 1',
+        }
+      };
+      const submissionObjects = [
+        { id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' }
+      ];
+      comp.externalSourceEntry = externalEntry;
+      ngbModal.open.and.returnValue({
+        componentInstance: { selectedEvent: observableOf(emittedEvent) },
+        close: () => {
+          return;
+        }
+      });
+      spyOn(comp, 'closeMetadataModal');
+      submissionServiceStub.createSubmissionFromExternalSource.and.returnValue(observableOf(submissionObjects));
+      spyOn(compAsAny.router, 'navigateByUrl');
+      scheduler.schedule(() => comp.import());
+      scheduler.flush();
+
+      expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalCollectionComponent, { size: 'lg' });
+      expect(comp.closeMetadataModal).toHaveBeenCalled();
+      expect(compAsAny.submissionService.createSubmissionFromExternalSource).toHaveBeenCalledWith(externalEntry._links.self.href, emittedEvent.collection.id);
+      expect(compAsAny.router.navigateByUrl).toHaveBeenCalledWith('/workspaceitems/' + submissionObjects[0].id + '/edit');
+      done();
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
new file mode 100644
index 00000000000..8294ec66ba1
--- /dev/null
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -0,0 +1,100 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { NgbActiveModal, NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { Metadata } from '../../../core/shared/metadata.utils';
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import { mergeMap } from 'rxjs/operators';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
+
+/**
+ * This component display a preview of an external source item.
+ */
+@Component({
+  selector: 'ds-submission-import-external-preview',
+  styleUrls: ['./submission-import-external-preview.component.scss'],
+  templateUrl: './submission-import-external-preview.component.html'
+})
+export class SubmissionImportExternalPreviewComponent implements OnInit {
+  /**
+   * The external source entry
+   */
+  public externalSourceEntry: ExternalSourceEntry;
+  /**
+   * The entry metadata list
+   */
+  public metadataList: Array<{ key: string, value: MetadataValue }>;
+  /**
+   * The modal for the entry preview
+   */
+  modalRef: NgbModalRef;
+
+  /**
+   * Initialize the component variables.
+   * @param {NgbActiveModal} activeModal
+   * @param {SubmissionService} submissionService
+   * @param {NgbModal} modalService
+   * @param {Router} router
+   * @param {NotificationsService} notificationService
+   */
+  constructor(
+    private activeModal: NgbActiveModal,
+    private submissionService: SubmissionService,
+    private modalService: NgbModal,
+    private router: Router,
+    private notificationService: NotificationsService
+  ) { }
+
+  /**
+   * Metadata initialization for HTML display.
+   */
+  ngOnInit(): void {
+    this.metadataList = [];
+    const metadataKeys = Object.keys(this.externalSourceEntry.metadata);
+    metadataKeys.forEach((key) => {
+      this.metadataList.push({
+        key: key,
+        value: Metadata.first(this.externalSourceEntry.metadata, key)
+      });
+    })
+  }
+
+  /**
+   * Closes the modal.
+   */
+  public closeMetadataModal(): void {
+    this.activeModal.dismiss(false);
+  }
+
+  /**
+   * Start the import of an entry by opening up a collection choice modal window.
+   */
+  public import(): void {
+    this.modalRef = this.modalService.open(SubmissionImportExternalCollectionComponent, {
+      size: 'lg',
+    });
+    this.closeMetadataModal();
+
+    this.modalRef.componentInstance.selectedEvent.pipe(
+      mergeMap((collectionListEntry: CollectionListEntry) => {
+        return this.submissionService.createSubmissionFromExternalSource(this.externalSourceEntry._links.self.href, collectionListEntry.collection.id);
+      })
+    ).subscribe((submissionObjects: SubmissionObject[]) => {
+      let isValid = false
+      if (submissionObjects.length === 1) {
+        if (submissionObjects[0] !== null) {
+          isValid = true;
+          this.router.navigateByUrl('/workspaceitems/' + submissionObjects[0].id + '/edit');
+        }
+      }
+      if (!isValid) {
+        this.notificationService.error('submission.import-external.preview.error.import.title', 'submission.import-external.preview.error.import.body');
+      }
+      this.modalRef.close();
+    });
+  }
+}
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
new file mode 100644
index 00000000000..535395e5345
--- /dev/null
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -0,0 +1,25 @@
+<div *ngIf="(isXsOrSm$ | async)" class="input-group mb-2">
+  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
+</div>
+<div class="input-group mb-5">
+  <input *ngIf="!(isXsOrSm$ | async)" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
+  <div [ngClass]="{'input-group-append': !(isXsOrSm$ | async)}" ngbDropdown role="group" aria-label="">
+    <button class="btn btn-outline-secondary w-fx" title="{{'submission.import-external.search.source.hint' |translate}}" ngbDropdownToggle>{{'submission.import-external.source.' + selectedElement?.name | translate}}</button>
+    <div ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
+      aria-haspopup="true"
+      aria-expanded="false"
+      aria-labelledby="scrollableDropdownMenuButton">
+      <div class="scrollable-menu"
+        aria-labelledby="scrollableDropdownMenuButton"
+        infiniteScroll
+        [infiniteScrollDistance]="2"
+        [infiniteScrollThrottle]="50"
+        (scrolled)="onScroll()"
+        [scrollWindow]="false">
+        <button ngbDropdownItem class="dropdown-item text-truncate" title="{{'submission.import-external.source.' + source?.name | translate}}" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
+        <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
+      </div>
+    </div>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):('submission.import-external.search.button' | translate)" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+  </div>
+</div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.scss b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.scss
new file mode 100644
index 00000000000..136bf12e0e7
--- /dev/null
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.scss
@@ -0,0 +1,27 @@
+.input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+  margin-left: -1px;
+  border-radius: 0 0.25rem 0.25rem 0;
+}
+
+.input-group-append .dropdown-toggle {
+  border-radius: 0;
+}
+
+.w-fx {
+  min-width: 200px;
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: $dropdown-menu-max-height / 2;
+  overflow-x: hidden;
+}
+
+.scrollable-dropdown-loading {
+  background-color: map-get($theme-colors, primary);
+  color: white;
+  height: $spacer * 2 !important;
+  line-height: $spacer * 2;
+  position: sticky;
+  bottom: 0;
+}
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
new file mode 100644
index 00000000000..4a7d02bf21d
--- /dev/null
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
@@ -0,0 +1,158 @@
+import { Component, NO_ERRORS_SCHEMA, ChangeDetectorRef } from '@angular/core';
+import { async, TestBed, ComponentFixture, inject, fakeAsync, tick } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { SubmissionImportExternalSearchbarComponent, SourceElement } from './submission-import-external-searchbar.component';
+import { ExternalSourceService } from '../../../core/data/external-source.service';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { getMockExternalSourceService, externalSourceOrcid, externalSourceCiencia, externalSourceMyStaffDb } from '../../../shared/mocks/external-source.service.mock';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { ExternalSource } from '../../../core/shared/external-source.model';
+import { FindListOptions } from '../../../core/data/request.models';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+describe('SubmissionImportExternalSearchbarComponent test suite', () => {
+  let comp: SubmissionImportExternalSearchbarComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionImportExternalSearchbarComponent>;
+  let scheduler: TestScheduler;
+
+  beforeEach(async (() => {
+    scheduler = getTestScheduler();
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionImportExternalSearchbarComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: ExternalSourceService, useClass: getMockExternalSourceService },
+        ChangeDetectorRef,
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+        SubmissionImportExternalSearchbarComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-submission-import-external-searchbar></ds-submission-import-external-searchbar>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionImportExternalSearchbarComponent', inject([SubmissionImportExternalSearchbarComponent], (app: SubmissionImportExternalSearchbarComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    let sourceList: SourceElement[];
+    let paginatedList: PaginatedList<ExternalSource>;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionImportExternalSearchbarComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      const pageInfo = new PageInfo();
+      paginatedList = buildPaginatedList(pageInfo, [externalSourceOrcid, externalSourceCiencia, externalSourceMyStaffDb]);
+      const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+      compAsAny.externalService.findAll.and.returnValue(observableOf(paginatedListRD));
+      sourceList = [
+        {id: 'orcid', name: 'orcid'},
+        {id: 'ciencia', name: 'ciencia'},
+        {id: 'my_staff_db', name: 'my_staff_db'},
+      ];
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it('Should init component properly (without initExternalSourceData)', () => {
+      comp.initExternalSourceData = { sourceId: '', query: '' };
+      scheduler.schedule(() => fixture.detectChanges());
+      scheduler.flush();
+
+      expect(comp.selectedElement).toEqual(sourceList[0]);
+      expect(compAsAny.pageInfo).toEqual(paginatedList.pageInfo);
+      expect(comp.sourceList).toEqual(sourceList);
+    });
+
+    it('Should init component properly (with initExternalSourceData populated)', () => {
+      comp.initExternalSourceData = { query: 'dummy', sourceId: 'ciencia' };
+      scheduler.schedule(() => fixture.detectChanges());
+      scheduler.flush();
+
+      expect(comp.selectedElement).toEqual(sourceList[1]);
+      expect(compAsAny.pageInfo).toEqual(paginatedList.pageInfo);
+      expect(comp.sourceList).toEqual(sourceList);
+    });
+
+    it('Variable \'selectedElement\' should be assigned', () => {
+      const selectedElement = {id: 'orcid', name: 'orcid'};
+      comp.makeSourceSelection(selectedElement);
+      expect(comp.selectedElement).toEqual(selectedElement);
+    });
+
+    it('Should load additional external sources', () => {
+      comp.sourceListLoading = false;
+      compAsAny.pageInfo = new PageInfo({
+        elementsPerPage: 3,
+        totalElements: 6,
+        totalPages: 2,
+        currentPage: 0
+      });
+      compAsAny.findListOptions = Object.assign({}, new FindListOptions(), {
+        elementsPerPage: 3,
+        currentPage: 0,
+      });
+      comp.sourceList = sourceList;
+      const expected = sourceList.concat(sourceList);
+
+      scheduler.schedule(() => comp.onScroll());
+      scheduler.flush();
+
+      expect(comp.sourceList).toEqual(expected);
+    });
+
+    it('The \'search\' method should call \'emit\'', () => {
+      comp.selectedElement = { id: 'orcidV2', name: 'orcidV2' };
+      comp.searchString = 'dummy';
+      const expected = { sourceId: comp.selectedElement.id, query: comp.searchString };
+      spyOn(comp.externalSourceData, 'emit');
+      comp.search();
+
+      expect(comp.externalSourceData.emit).toHaveBeenCalledWith(expected);
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
new file mode 100644
index 00000000000..15f97a5b35b
--- /dev/null
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -0,0 +1,195 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output
+} from '@angular/core';
+
+import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { catchError, tap } from 'rxjs/operators';
+
+import { ExternalSourceService } from '../../../core/data/external-source.service';
+import { ExternalSource } from '../../../core/shared/external-source.model';
+import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { FindListOptions } from '../../../core/data/request.models';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { hasValue } from '../../../shared/empty.util';
+
+/**
+ * Interface for the selected external source element.
+ */
+export interface SourceElement {
+  id: string;
+  name: string;
+}
+
+/**
+ * Interface for the external source data to export.
+ */
+export interface ExternalSourceData {
+  query: string;
+  sourceId: string;
+}
+
+/**
+ * This component builds the searchbar for the submission external import.
+ */
+@Component({
+  selector: 'ds-submission-import-external-searchbar',
+  styleUrls: ['./submission-import-external-searchbar.component.scss'],
+  templateUrl: './submission-import-external-searchbar.component.html'
+})
+export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDestroy {
+  /**
+   * The init external source value.
+   */
+  @Input() public initExternalSourceData: ExternalSourceData;
+  /**
+   * The selected external sources.
+   */
+  public selectedElement: SourceElement;
+  /**
+   * The list of external sources.
+   */
+  public sourceList: SourceElement[];
+  /**
+   * The string used to search items in the external sources.
+   */
+  public searchString: string;
+  /**
+   * The external sources loading status.
+   */
+  public sourceListLoading = false;
+  /**
+   * Emits true if were on a small screen
+   */
+  public isXsOrSm$: Observable<boolean>;
+  /**
+   * The external source data to use to perform the search.
+   */
+  @Output() public externalSourceData: EventEmitter<ExternalSourceData> = new EventEmitter<ExternalSourceData>();
+
+  /**
+   * The external sources pagination data.
+   */
+  protected pageInfo: PageInfo;
+  /**
+   * The options for REST data retireval.
+   */
+  protected findListOptions: FindListOptions;
+
+  /**
+   * The subscription to unsubscribe
+   */
+  protected sub: Subscription;
+
+  /**
+   * Initialize the component variables.
+   * @param {ExternalSourceService} externalService
+   * @param {ChangeDetectorRef} cdr
+   * @param {HostWindowService} windowService
+   */
+  constructor(
+    private externalService: ExternalSourceService,
+    private cdr: ChangeDetectorRef,
+    protected windowService: HostWindowService
+  ) {
+  }
+
+  /**
+   * Component initialization and retrieve first page of external sources.
+   */
+  ngOnInit() {
+    this.selectedElement = {
+      id: '',
+      name: 'loading'
+    };
+    this.searchString = '';
+    this.sourceList = [];
+    this.findListOptions = Object.assign({}, new FindListOptions(), {
+      elementsPerPage: 5,
+      currentPage: 1,
+    });
+    this.externalService.findAll(this.findListOptions).pipe(
+      catchError(() => {
+        const pageInfo = new PageInfo();
+        const paginatedList = buildPaginatedList(pageInfo, []);
+        const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+        return observableOf(paginatedListRD);
+      }),
+      getFirstSucceededRemoteDataPayload()
+    ).subscribe((externalSource: PaginatedList<ExternalSource>) => {
+      externalSource.page.forEach((element) => {
+        this.sourceList.push({ id: element.id, name: element.name });
+        if (this.initExternalSourceData.sourceId === element.id) {
+          this.selectedElement = { id: element.id, name: element.name };
+          this.searchString = this.initExternalSourceData.query;
+        }
+      });
+      if (this.selectedElement.id === '') {
+        this.selectedElement = this.sourceList[0];
+      }
+      this.pageInfo = externalSource.pageInfo;
+      this.cdr.detectChanges();
+    });
+    this.isXsOrSm$ = this.windowService.isXsOrSm();
+  }
+
+  /**
+   * Set the selected external source.
+   */
+  public makeSourceSelection(source): void {
+    this.selectedElement = source;
+  }
+
+  /**
+   * Load the next pages of external sources.
+   */
+  public onScroll(): void {
+    if (!this.sourceListLoading && ((this.pageInfo.currentPage + 1) <= this.pageInfo.totalPages)) {
+      this.sourceListLoading = true;
+      this.findListOptions = Object.assign({}, new FindListOptions(), {
+        elementsPerPage: 5,
+        currentPage: this.findListOptions.currentPage + 1,
+      });
+      this.sub = this.externalService.findAll(this.findListOptions).pipe(
+        catchError(() => {
+          const pageInfo = new PageInfo();
+          const paginatedList = buildPaginatedList(pageInfo, []);
+          const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+          return observableOf(paginatedListRD);
+        }),
+        tap(() => this.sourceListLoading = false)
+      ).subscribe((externalSource: RemoteData<PaginatedList<ExternalSource>>) => {
+        externalSource.payload.page.forEach((element) => {
+          this.sourceList.push({ id: element.id, name: element.name });
+        })
+        this.pageInfo = externalSource.payload.pageInfo;
+        this.cdr.detectChanges();
+      });
+    }
+  }
+
+  /**
+   * Passes the search parameters to the parent component.
+   */
+  public search(): void {
+    this.externalSourceData.emit({ sourceId: this.selectedElement.id, query: this.searchString });
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    if (hasValue(this.sub)) {
+      this.sub.unsubscribe();
+    }
+  }
+}
diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
new file mode 100644
index 00000000000..bee5f5d872c
--- /dev/null
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -0,0 +1,47 @@
+<div class="container">
+  <div class="row">
+    <div class="col-md-12">
+      <h2 id="header" class="pb-2">{{'submission.import-external.title' | translate}}</h2>
+      <ds-submission-import-external-searchbar
+        [initExternalSourceData]="routeData"
+        (externalSourceData) = "getExternalSourceData($event)">
+      </ds-submission-import-external-searchbar>
+    </div>
+  </div>
+  <div class="row">
+    <div *ngIf="routeData.sourceId !== ''" class="col-md-12">
+      <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
+        <h3 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + routeData.sourceId | translate}}</h3>
+        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !(isLoading$ | async) && entriesRD?.payload?.page?.length > 0" @fadeIn
+                                [objects]="entriesRD"
+                                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+                                [config]="initialPagination"
+                                [hideGear]="true"
+                                [context]="context"
+                                [importable]="true"
+                                [importConfig]="importConfig"
+                                (importObject)="import($event)"
+                                (pageChange)="paginationChange();">
+        </ds-viewable-collection>
+        <ds-loading *ngIf="(isLoading$ | async)"
+                    message="{{'loading.search-results' | translate}}"></ds-loading>
+        <div *ngIf="!(isLoading$ | async) && entriesRD?.payload?.page?.length === 0" id="empty-external-entry-list">
+          {{ 'search.results.empty' | translate }}
+        </div>
+      </ng-container>
+    </div>
+    <div *ngIf="routeData.sourceId === ''" class="col-md-12">
+      <ds-alert [type]="'alert-info'">
+        <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
+      </ds-alert>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <hr>
+      <a class="btn btn-outline-secondary" [routerLink]="['/mydspace']" role="button">
+        <i class="fa fa-chevron-left" aria-hidden="true"></i> {{'submission.import-external.back-to-my-dspace' | translate}}
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/app/submission/import-external/submission-import-external.component.scss b/src/app/submission/import-external/submission-import-external.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts
new file mode 100644
index 00000000000..10370d5e77c
--- /dev/null
+++ b/src/app/submission/import-external/submission-import-external.component.spec.ts
@@ -0,0 +1,173 @@
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+
+import { getTestScheduler } from 'jasmine-marbles';
+import { TranslateModule } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { SubmissionImportExternalComponent } from './submission-import-external.component';
+import { ExternalSourceService } from '../../core/data/external-source.service';
+import { getMockExternalSourceService } from '../../shared/mocks/external-source.service.mock';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { RouteService } from '../../core/services/route.service';
+import { createPaginatedList, createTestComponent } from '../../shared/testing/utils.test';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
+import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component';
+
+describe('SubmissionImportExternalComponent test suite', () => {
+  let comp: SubmissionImportExternalComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionImportExternalComponent>;
+  let scheduler: TestScheduler;
+  const ngbModal = jasmine.createSpyObj('modal', ['open']);
+  const mockSearchOptions = observableOf(new PaginatedSearchOptions({
+    pagination: Object.assign(new PaginationComponentOptions(), {
+      pageSize: 10,
+      currentPage: 0
+    }),
+    query: 'test'
+  }));
+  const searchConfigServiceStub = {
+    paginatedSearchOptions: mockSearchOptions
+  };
+  const mockExternalSourceService: any = getMockExternalSourceService();
+
+  beforeEach(async (() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        SubmissionImportExternalComponent,
+        TestComponent,
+        VarDirective
+      ],
+      providers: [
+        { provide: ExternalSourceService, useValue: mockExternalSourceService },
+        { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: NgbModal, useValue: ngbModal },
+        SubmissionImportExternalComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-submission-import-external></ds-submission-import-external>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionImportExternalComponent', inject([SubmissionImportExternalComponent], (app: SubmissionImportExternalComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionImportExternalComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      scheduler = getTestScheduler();
+      mockExternalSourceService.getExternalSourceEntries.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])))
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it('Should init component properly (without route data)', () => {
+      const expectedEntries = createSuccessfulRemoteDataObject(createPaginatedList([]));
+      spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValue(observableOf(''));
+      fixture.detectChanges();
+
+      expect(comp.routeData).toEqual({ sourceId: '', query: '' });
+      expect(comp.isLoading$.value).toBe(false);
+      expect(comp.entriesRD$.value).toEqual(expectedEntries);
+    });
+
+    it('Should init component properly (with route data)', () => {
+      spyOn(compAsAny, 'retrieveExternalSources');
+      spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValues(observableOf('source'), observableOf('dummy'));
+      fixture.detectChanges();
+
+      expect(compAsAny.retrieveExternalSources).toHaveBeenCalledWith('source', 'dummy');
+    });
+
+    it('Should call \'getExternalSourceEntries\' properly', () => {
+      comp.routeData = { sourceId: '', query: '' };
+      scheduler.schedule(() => compAsAny.retrieveExternalSources('orcidV2', 'test'));
+      scheduler.flush();
+
+      expect(comp.routeData).toEqual({ sourceId: 'orcidV2', query: 'test' });
+      expect(comp.isLoading$.value).toBe(false);
+      expect(compAsAny.externalService.getExternalSourceEntries).toHaveBeenCalled();
+    });
+
+    it('Should call \'router.navigate\'', () => {
+      comp.routeData = { sourceId: '', query: '' };
+      spyOn(compAsAny, 'retrieveExternalSources').and.callFake(() => null);
+      compAsAny.router.navigate.and.returnValue( new Promise(() => {return;}))
+      const event = { sourceId: 'orcidV2', query: 'dummy' };
+
+      scheduler.schedule(() => comp.getExternalSourceData(event));
+      scheduler.flush();
+
+      expect(compAsAny.router.navigate).toHaveBeenCalledWith([], { queryParams: { source: event.sourceId, query: event.query }, replaceUrl: true });
+    });
+
+    it('Entry should be passed to the component loaded inside the modal', () => {
+      const entry = Object.assign(new ExternalSourceEntry(), {
+        id: '0001-0001-0001-0001',
+        display: 'John Doe',
+        value: 'John, Doe',
+        metadata: {
+          'dc.identifier.uri': [
+            {
+              value: 'https://orcid.org/0001-0001-0001-0001'
+            }
+          ]
+        }
+      });
+      ngbModal.open.and.returnValue({componentInstance: { externalSourceEntry: null}});
+      comp.import(entry);
+
+      expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg' });
+      expect(comp.modalRef.componentInstance.externalSourceEntry).toEqual(entry);
+    });
+  });
+
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
new file mode 100644
index 00000000000..55abdfdefc6
--- /dev/null
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -0,0 +1,195 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { BehaviorSubject, combineLatest, Subscription } from 'rxjs';
+import { filter, flatMap, take } from 'rxjs/operators';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+
+import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSourceData } from './import-external-searchbar/submission-import-external-searchbar.component';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
+import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { Context } from '../../core/shared/context.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { RouteService } from '../../core/services/route.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component';
+import { fadeIn } from '../../shared/animations/fade';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { getFinishedRemoteData } from '../../core/shared/operators';
+
+/**
+ * This component allows to submit a new workspaceitem importing the data from an external source.
+ */
+@Component({
+  selector: 'ds-submission-import-external',
+  styleUrls: ['./submission-import-external.component.scss'],
+  templateUrl: './submission-import-external.component.html',
+  animations: [fadeIn]
+})
+export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
+
+  /**
+   * The external source search data from the routing service.
+   */
+  public routeData: ExternalSourceData;
+  /**
+   * The displayed list of entries
+   */
+  public entriesRD$: BehaviorSubject<RemoteData<PaginatedList<ExternalSourceEntry>>> = new BehaviorSubject<RemoteData<PaginatedList<ExternalSourceEntry>>>(null);
+  /**
+   * TRUE if the REST service is called to retrieve the external source items
+   */
+  public isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  /**
+   * Configuration to use for the import buttons
+   */
+  public importConfig: { buttonLabel: string };
+  /**
+   * Suffix for button label
+   */
+  public label: string;
+  /**
+   * The ID of the list to add/remove selected items to/from
+   */
+  public listId: string;
+  /**
+   * TRUE if the selection is repeatable
+   */
+  public repeatable: boolean;
+  /**
+   * The initial pagination options
+   */
+  public initialPagination = Object.assign(new PaginationComponentOptions(), {
+    id: 'submission-external-source-relation-list',
+    pageSize: 10
+  });
+  /**
+   * The context to displaying lists for
+   */
+  public context: Context;
+  /**
+   * The modal for the entry preview
+   */
+  public modalRef: NgbModalRef;
+
+  /**
+   * The subscription to unsubscribe
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize the component variables.
+   * @param {SearchConfigurationService} searchConfigService
+   * @param {ExternalSourceService} externalService
+   * @param {RouteService} routeService
+   * @param {Router} router
+   * @param {NgbModal} modalService
+   */
+  constructor(
+    public searchConfigService: SearchConfigurationService,
+    private externalService: ExternalSourceService,
+    private routeService: RouteService,
+    private router: Router,
+    private modalService: NgbModal,
+  ) {
+  }
+
+  /**
+   * Get the entries for the selected external source and set initial configuration.
+   */
+  ngOnInit(): void {
+    this.label = 'Journal';
+    this.listId = 'list-submission-external-sources';
+    this.context = Context.EntitySearchModalWithNameVariants;
+    this.repeatable = false;
+    this.routeData = { sourceId: '', query: '' };
+    this.importConfig = {
+      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
+    };
+    this.entriesRD$ = new BehaviorSubject(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), [])));
+    this.isLoading$ = new BehaviorSubject(false);
+    this.subs.push(combineLatest(
+      [
+        this.routeService.getQueryParameterValue('source'),
+        this.routeService.getQueryParameterValue('query')
+      ]).pipe(
+      take(1)
+    ).subscribe(([source, query]: [string, string]) => {
+      this.retrieveExternalSources(source, query);
+    }));
+  }
+
+  /**
+   * Get the data from the searchbar and changes the router data.
+   */
+  public getExternalSourceData(event: ExternalSourceData): void {
+    this.router.navigate(
+      [],
+      {
+        queryParams: { source: event.sourceId, query: event.query },
+        replaceUrl: true
+      }
+    ).then(() => this.retrieveExternalSources(event.sourceId, event.query));
+  }
+
+  /**
+   * Display an item preview by opening up an import modal window.
+   * @param entry The entry to import
+   */
+  public import(entry): void {
+    this.modalRef = this.modalService.open(SubmissionImportExternalPreviewComponent, {
+      size: 'lg',
+    });
+    const modalComp = this.modalRef.componentInstance;
+    modalComp.externalSourceEntry = entry;
+  }
+
+  /**
+   * Retrieve external sources on pagination change
+   */
+  paginationChange() {
+    this.retrieveExternalSources(this.routeData.sourceId, this.routeData.query);
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Retrieve external source entries
+   *
+   * @param source The source tupe
+   * @param query The query string to search
+   */
+  private retrieveExternalSources(source: string, query: string): void {
+    if (isNotEmpty(source) && isNotEmpty(query)) {
+      this.routeData.sourceId = source;
+      this.routeData.query = query;
+      this.isLoading$.next(true);
+      this.subs.push(
+        this.searchConfigService.paginatedSearchOptions.pipe(
+          filter((searchOptions) => searchOptions.query === query),
+          take(1),
+          flatMap((searchOptions) => this.externalService.getExternalSourceEntries(this.routeData.sourceId, searchOptions).pipe(
+            getFinishedRemoteData(),
+            take(1)
+          )),
+          take(1)
+        ).subscribe((rdData) => {
+          this.entriesRD$.next(rdData);
+          this.isLoading$.next(false);
+        })
+      );
+    }
+  }
+
+}
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index 57226fc531a..962f216c7d5 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -10,6 +10,7 @@ import {
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { SectionsType } from '../sections/sections-type';
+import { Item } from '../../core/shared/item.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -39,9 +40,11 @@ export const SubmissionObjectActionTypes = {
   INIT_SECTION: type('dspace/submission/INIT_SECTION'),
   ENABLE_SECTION: type('dspace/submission/ENABLE_SECTION'),
   DISABLE_SECTION: type('dspace/submission/DISABLE_SECTION'),
+  SET_SECTION_FORM_ID: type('dspace/submission/SET_SECTION_FORM_ID'),
   SECTION_STATUS_CHANGE: type('dspace/submission/SECTION_STATUS_CHANGE'),
   SECTION_LOADING_STATUS_CHANGE: type('dspace/submission/SECTION_LOADING_STATUS_CHANGE'),
-  UPLOAD_SECTION_DATA: type('dspace/submission/UPLOAD_SECTION_DATA'),
+  UPDATE_SECTION_DATA: type('dspace/submission/UPDATE_SECTION_DATA'),
+  UPDATE_SECTION_DATA_SUCCESS: type('dspace/submission/UPDATE_SECTION_DATA_SUCCESS'),
   SAVE_AND_DEPOSIT_SUBMISSION: type('dspace/submission/SAVE_AND_DEPOSIT_SUBMISSION'),
   DEPOSIT_SUBMISSION: type('dspace/submission/DEPOSIT_SUBMISSION'),
   DEPOSIT_SUBMISSION_SUCCESS: type('dspace/submission/DEPOSIT_SUBMISSION_SUCCESS'),
@@ -198,12 +201,13 @@ export class DisableSectionAction implements Action {
 }
 
 export class UpdateSectionDataAction implements Action {
-  type = SubmissionObjectActionTypes.UPLOAD_SECTION_DATA;
+  type = SubmissionObjectActionTypes.UPDATE_SECTION_DATA;
   payload: {
     submissionId: string;
     sectionId: string;
     data: WorkspaceitemSectionDataType;
     errors: SubmissionSectionError[];
+    metadata: string[];
   };
 
   /**
@@ -217,15 +221,22 @@ export class UpdateSectionDataAction implements Action {
    *    the section's data
    * @param errors
    *    the section's errors
+   * @param metadata
+   *    the section's metadata
    */
   constructor(submissionId: string,
               sectionId: string,
               data: WorkspaceitemSectionDataType,
-              errors: SubmissionSectionError[]) {
-    this.payload = { submissionId, sectionId, data, errors };
+              errors: SubmissionSectionError[],
+              metadata?: string[]) {
+    this.payload = { submissionId, sectionId, data, errors, metadata };
   }
 }
 
+export class UpdateSectionDataSuccessAction implements Action {
+  type = SubmissionObjectActionTypes.UPDATE_SECTION_DATA_SUCCESS;
+}
+
 export class RemoveSectionErrorsAction implements Action {
   type = SubmissionObjectActionTypes.REMOVE_SECTION_ERRORS;
   payload: {
@@ -246,6 +257,29 @@ export class RemoveSectionErrorsAction implements Action {
   }
 }
 
+export class SetSectionFormId implements Action {
+  type = SubmissionObjectActionTypes.SET_SECTION_FORM_ID;
+  payload: {
+    submissionId: string;
+    sectionId: string;
+    formId: string;
+  };
+
+  /**
+   * Create a new SetSectionFormId
+   *
+   * @param submissionId
+   *    the submission's ID
+   * @param sectionId
+   *    the section's ID
+   * @param formId
+   *    the section's formId
+   */
+  constructor(submissionId: string, sectionId: string, formId: string) {
+    this.payload = { submissionId, sectionId, formId };
+  }
+}
+
 // Submission actions
 
 export class CompleteInitSubmissionFormAction implements Action {
@@ -273,6 +307,7 @@ export class InitSubmissionFormAction implements Action {
     selfUrl: string;
     submissionDefinition: SubmissionDefinitionsModel;
     sections: WorkspaceitemSectionsObject;
+    item: Item;
     errors: SubmissionSectionError[];
   };
 
@@ -297,8 +332,9 @@ export class InitSubmissionFormAction implements Action {
               selfUrl: string,
               submissionDefinition: SubmissionDefinitionsModel,
               sections: WorkspaceitemSectionsObject,
+              item: Item,
               errors: SubmissionSectionError[]) {
-    this.payload = { collectionId, submissionId, selfUrl, submissionDefinition, sections, errors };
+    this.payload = { collectionId, submissionId, selfUrl, submissionDefinition, sections, item, errors };
   }
 }
 
@@ -360,6 +396,7 @@ export class SaveSubmissionFormAction implements Action {
   type = SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM;
   payload: {
     submissionId: string;
+    isManual?: boolean;
   };
 
   /**
@@ -368,8 +405,8 @@ export class SaveSubmissionFormAction implements Action {
    * @param submissionId
    *    the submission's ID
    */
-  constructor(submissionId: string) {
-    this.payload = { submissionId };
+  constructor(submissionId: string, isManual: boolean = false) {
+    this.payload = { submissionId, isManual };
   }
 }
 
@@ -378,6 +415,7 @@ export class SaveSubmissionFormSuccessAction implements Action {
   payload: {
     submissionId: string;
     submissionObject: SubmissionObject[];
+    notify?: boolean
   };
 
   /**
@@ -388,8 +426,8 @@ export class SaveSubmissionFormSuccessAction implements Action {
    * @param submissionObject
    *    the submission's Object
    */
-  constructor(submissionId: string, submissionObject: SubmissionObject[]) {
-    this.payload = { submissionId, submissionObject };
+  constructor(submissionId: string, submissionObject: SubmissionObject[], notify?: boolean) {
+    this.payload = { submissionId, submissionObject, notify };
   }
 }
 
@@ -435,6 +473,7 @@ export class SaveSubmissionSectionFormSuccessAction implements Action {
   payload: {
     submissionId: string;
     submissionObject: SubmissionObject[];
+    notify?: boolean
   };
 
   /**
@@ -445,8 +484,8 @@ export class SaveSubmissionSectionFormSuccessAction implements Action {
    * @param submissionObject
    *    the submission's Object
    */
-  constructor(submissionId: string, submissionObject: SubmissionObject[]) {
-    this.payload = { submissionId, submissionObject };
+  constructor(submissionId: string, submissionObject: SubmissionObject[], notify?: boolean) {
+    this.payload = { submissionId, submissionObject, notify };
   }
 }
 
@@ -475,6 +514,7 @@ export class ResetSubmissionFormAction implements Action {
     selfUrl: string;
     sections: WorkspaceitemSectionsObject;
     submissionDefinition: SubmissionDefinitionsModel;
+    item: Item;
   };
 
   /**
@@ -491,8 +531,8 @@ export class ResetSubmissionFormAction implements Action {
    * @param submissionDefinition
    *    the submission's form definition
    */
-  constructor(collectionId: string, submissionId: string, selfUrl: string, sections: WorkspaceitemSectionsObject, submissionDefinition: SubmissionDefinitionsModel) {
-    this.payload = { collectionId, submissionId, selfUrl, sections, submissionDefinition };
+  constructor(collectionId: string, submissionId: string, selfUrl: string, sections: WorkspaceitemSectionsObject, submissionDefinition: SubmissionDefinitionsModel, item: Item) {
+    this.payload = { collectionId, submissionId, selfUrl, sections, submissionDefinition, item };
   }
 }
 
@@ -766,6 +806,7 @@ export class DeleteUploadedFileAction implements Action {
  */
 export type SubmissionObjectAction = DisableSectionAction
   | InitSectionAction
+  | SetSectionFormId
   | EnableSectionAction
   | InitSubmissionFormAction
   | ResetSubmissionFormAction
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index 6a8475b2d40..477a84531e2 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -32,7 +32,7 @@ import {
   mockSubmissionId,
   mockSubmissionSelfUrl,
   mockSubmissionState,
-  mockSubmissionRestResponse
+  mockSubmissionRestResponse, mockSectionsErrorsTwo
 } from '../../shared/mocks/submission.mock';
 import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
@@ -47,15 +47,20 @@ import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { StoreMock } from '../../shared/testing/store.mock';
 import { AppState, storeModuleConfig } from '../../app.reducer';
 import parseSectionErrors from '../utils/parseSectionErrors';
+import { Item } from '../../core/shared/item.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import {formStateSelector} from '../../shared/form/selectors';
 
 describe('SubmissionObjectEffects test suite', () => {
   let submissionObjectEffects: SubmissionObjectEffects;
   let actions: Observable<any>;
   let store: StoreMock<AppState>;
 
-  const notificationsServiceStub = new NotificationsServiceStub();
-  const submissionServiceStub = new SubmissionServiceStub();
-  const submissionJsonPatchOperationsServiceStub = new SubmissionJsonPatchOperationsServiceStub();
+  let notificationsServiceStub;
+  let submissionServiceStub;
+  let submissionJsonPatchOperationsServiceStub;
   const collectionId: string = mockSubmissionCollectionId;
   const submissionId: string = mockSubmissionId;
   const submissionDefinitionResponse: any = mockSubmissionDefinitionResponse;
@@ -64,6 +69,11 @@ describe('SubmissionObjectEffects test suite', () => {
   const submissionState: any = Object.assign({}, mockSubmissionState);
 
   beforeEach(() => {
+
+    notificationsServiceStub = new NotificationsServiceStub();
+    submissionServiceStub =  new SubmissionServiceStub();
+    submissionJsonPatchOperationsServiceStub = new SubmissionJsonPatchOperationsServiceStub();
+
     TestBed.configureTestingModule({
       imports: [
         StoreModule.forRoot({}, storeModuleConfig),
@@ -83,6 +93,10 @@ describe('SubmissionObjectEffects test suite', () => {
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub },
+        { provide: WorkspaceitemDataService, useValue: {} },
+        { provide: WorkflowItemDataService, useValue: {} },
+        { provide: WorkflowItemDataService, useValue: {} },
+        { provide: HALEndpointService, useValue: {} },
       ],
     });
 
@@ -101,6 +115,7 @@ describe('SubmissionObjectEffects test suite', () => {
             selfUrl: selfUrl,
             submissionDefinition: submissionDefinition,
             sections: {},
+            item: {metadata: {}},
             errors: [],
           }
         }
@@ -153,6 +168,7 @@ describe('SubmissionObjectEffects test suite', () => {
             selfUrl: selfUrl,
             submissionDefinition: submissionDefinition,
             sections: {},
+            item: new Item(),
             errors: [],
           }
         }
@@ -165,6 +181,7 @@ describe('SubmissionObjectEffects test suite', () => {
           selfUrl,
           submissionDefinition,
           {},
+          new Item(),
           null
         )
       });
@@ -195,6 +212,52 @@ describe('SubmissionObjectEffects test suite', () => {
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
     });
 
+    it('should enable notifications if is manual', () => {
+      actions = hot('--a-', {
+        a: {
+          type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
+          payload: {
+            submissionId: submissionId,
+            isManual: true
+          }
+        }
+      });
+
+      submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
+      const expected = cold('--b-', {
+        b: new SaveSubmissionFormSuccessAction(
+          submissionId,
+          mockSubmissionRestResponse as any,
+          true
+        )
+      });
+
+      expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
+    });
+
+    it('should disable notifications if is not manual', () => {
+      actions = hot('--a-', {
+        a: {
+          type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
+          payload: {
+            submissionId: submissionId,
+            isManual: false
+          }
+        }
+      });
+
+      submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
+      const expected = cold('--b-', {
+        b: new SaveSubmissionFormSuccessAction(
+          submissionId,
+          mockSubmissionRestResponse as any,
+          false
+        )
+      });
+
+      expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
+    });
+
     it('should return a SAVE_SUBMISSION_FORM_ERROR action on error', () => {
       actions = hot('--a-', {
         a: {
@@ -265,7 +328,7 @@ describe('SubmissionObjectEffects test suite', () => {
 
   describe('saveSubmissionSuccess$', () => {
 
-    it('should return a UPLOAD_SECTION_DATA action for each updated section', () => {
+    it('should return a UPDATE_SECTION_DATA action for each updated section', () => {
       store.nextState({
         submission: {
           objects: submissionState
@@ -281,7 +344,8 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
+            submissionObject: response,
+            notify: true
           }
         }
       });
@@ -313,6 +377,61 @@ describe('SubmissionObjectEffects test suite', () => {
 
     });
 
+    it('should not display errors when notification are disabled and field are not touched', () => {
+      store.nextState({
+        submission: {
+          objects: submissionState
+        },
+        forms: {
+          '2_traditionalpageone': {
+            touched: {
+              'dc.title': true
+            }
+          }
+        }
+      } as any);
+
+      const response = [Object.assign({}, mockSubmissionRestResponse[0], {
+        sections: mockSectionsData,
+        errors: mockSectionsErrors
+      })];
+      actions = hot('--a-', {
+        a: {
+          type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
+          payload: {
+            submissionId: submissionId,
+            submissionObject: response,
+            notify: false
+          }
+        }
+      });
+
+      const errorsList = parseSectionErrors(mockSectionsErrorsTwo);
+      const expected = cold('--(bcd)-', {
+        b: new UpdateSectionDataAction(
+          submissionId,
+          'traditionalpageone',
+          mockSectionsData.traditionalpageone as any,
+          errorsList.traditionalpageone
+        ),
+        c: new UpdateSectionDataAction(
+          submissionId,
+          'license',
+          mockSectionsData.license as any,
+          errorsList.license || []
+        ),
+        d: new UpdateSectionDataAction(
+          submissionId,
+          'upload',
+          mockSectionsData.upload as any,
+          errorsList.upload || []
+        ),
+      });
+
+      expect(submissionObjectEffects.saveSubmissionSectionSuccess$).toBeObservable(expected);
+      expect(notificationsServiceStub.warning).not.toHaveBeenCalled();
+    });
+
     it('should display a success notification', () => {
       store.nextState({
         submission: {
@@ -460,6 +579,203 @@ describe('SubmissionObjectEffects test suite', () => {
 
   });
 
+  describe('saveSubmissionSectionSuccess$', () => {
+
+    it('should return a UPDATE_SECTION_DATA action for each updated section', () => {
+      store.nextState({
+        submission: {
+          objects: submissionState
+        }
+      } as any);
+
+      const response = [Object.assign({}, mockSubmissionRestResponse[0], {
+        sections: mockSectionsData,
+        errors: mockSectionsErrors
+      })];
+      actions = hot('--a-', {
+        a: {
+          type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
+          payload: {
+            submissionId: submissionId,
+            submissionObject: response
+          }
+        }
+      });
+
+      const errorsList = parseSectionErrors(mockSectionsErrors);
+      const expected = cold('--(bcd)-', {
+        b: new UpdateSectionDataAction(
+          submissionId,
+          'traditionalpageone',
+          mockSectionsData.traditionalpageone as any,
+          []
+        ),
+        c: new UpdateSectionDataAction(
+          submissionId,
+          'license',
+          mockSectionsData.license as any,
+          errorsList.license || []
+        ),
+        d: new UpdateSectionDataAction(
+          submissionId,
+          'upload',
+          mockSectionsData.upload as any,
+          errorsList.upload || []
+        ),
+      });
+
+      expect(submissionObjectEffects.saveSubmissionSectionSuccess$).toBeObservable(expected);
+
+    });
+
+    it('should not display a success notification', () => {
+      store.nextState({
+        submission: {
+          objects: submissionState
+        }
+      } as any);
+
+      const response = [Object.assign({}, mockSubmissionRestResponse[0], {
+        sections: mockSectionsData
+      })];
+      actions = hot('--a-', {
+        a: {
+          type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
+          payload: {
+            submissionId: submissionId,
+            submissionObject: response
+          }
+        }
+      });
+
+      const expected = cold('--(bcd)-', {
+        b: new UpdateSectionDataAction(
+          submissionId,
+          'traditionalpageone',
+          mockSectionsData.traditionalpageone as any,
+          []
+        ),
+        c: new UpdateSectionDataAction(
+          submissionId,
+          'license',
+          mockSectionsData.license as any,
+          []
+        ),
+        d: new UpdateSectionDataAction(
+          submissionId,
+          'upload',
+          mockSectionsData.upload as any,
+          []
+        ),
+      });
+
+      expect(submissionObjectEffects.saveSubmissionSectionSuccess$).toBeObservable(expected);
+      expect(notificationsServiceStub.success).not.toHaveBeenCalled();
+    });
+
+    it('should not display a warning notification when there are errors', () => {
+      store.nextState({
+        submission: {
+          objects: submissionState
+        }
+      } as any);
+
+      const response = [Object.assign({}, mockSubmissionRestResponse[0], {
+        sections: mockSectionsData,
+        errors: mockSectionsErrors
+      })];
+      actions = hot('--a-', {
+        a: {
+          type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
+          payload: {
+            submissionId: submissionId,
+            submissionObject: response
+          }
+        }
+      });
+
+      const errorsList = parseSectionErrors(mockSectionsErrors);
+      console.log(errorsList);
+      const expected = cold('--(bcd)-', {
+        b: new UpdateSectionDataAction(
+          submissionId,
+          'traditionalpageone',
+          mockSectionsData.traditionalpageone as any,
+          []
+        ),
+        c: new UpdateSectionDataAction(
+          submissionId,
+          'license',
+          mockSectionsData.license as any,
+          errorsList.license || []
+        ),
+        d: new UpdateSectionDataAction(
+          submissionId,
+          'upload',
+          mockSectionsData.upload as any,
+          errorsList.upload || []
+        ),
+      });
+
+      expect(submissionObjectEffects.saveSubmissionSectionSuccess$).toBeObservable(expected);
+      expect(notificationsServiceStub.warning).not.toHaveBeenCalled();
+    });
+
+    it('should detect new sections but not notify for it', () => {
+      store.nextState({
+        submission: {
+          objects: submissionState
+        }
+      } as any);
+
+      const response = [Object.assign({}, mockSubmissionRestResponse[0], {
+        sections: mockSectionsDataTwo,
+        errors: mockSectionsErrors
+      })];
+      actions = hot('--a-', {
+        a: {
+          type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
+          payload: {
+            submissionId: submissionId,
+            submissionObject: response,
+          }
+        }
+      });
+
+      const errorsList = parseSectionErrors(mockSectionsErrors);
+      const expected = cold('--(bcde)-', {
+        b: new UpdateSectionDataAction(
+          submissionId,
+          'traditionalpageone',
+          mockSectionsDataTwo.traditionalpageone as any,
+          []
+        ),
+        c: new UpdateSectionDataAction(
+          submissionId,
+          'traditionalpagetwo',
+          mockSectionsDataTwo.traditionalpagetwo as any,
+          errorsList.traditionalpagetwo || []
+        ),
+        d: new UpdateSectionDataAction(
+          submissionId,
+          'license',
+          mockSectionsDataTwo.license as any,
+          errorsList.license || []
+        ),
+        e: new UpdateSectionDataAction(
+          submissionId,
+          'upload',
+          mockSectionsDataTwo.upload as any,
+          errorsList.upload || []
+        ),
+      });
+
+      expect(submissionObjectEffects.saveSubmissionSectionSuccess$).toBeObservable(expected);
+      expect(submissionServiceStub.notifyNewSection).not.toHaveBeenCalled();
+    });
+
+  });
+
   describe('saveSection$', () => {
     it('should return a SAVE_SUBMISSION_SECTION_FORM_SUCCESS action on success', () => {
       actions = hot('--a-', {
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index a2a3350c6a3..4f6563c6622 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -2,10 +2,19 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { union } from 'lodash';
+import { isEqual, union } from 'lodash';
 
-import { from as observableFrom, of as observableOf } from 'rxjs';
-import { catchError, map, mergeMap, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { from as observableFrom, Observable, of as observableOf } from 'rxjs';
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+  withLatestFrom
+} from 'rxjs/operators';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
@@ -19,7 +28,6 @@ import { SectionsService } from '../sections/sections.service';
 import { SubmissionState } from '../submission.reducers';
 import { SubmissionService } from '../submission.service';
 import parseSectionErrors from '../utils/parseSectionErrors';
-
 import {
   CompleteInitSubmissionFormAction,
   DepositSubmissionAction,
@@ -41,9 +49,17 @@ import {
   SaveSubmissionSectionFormSuccessAction,
   SubmissionObjectAction,
   SubmissionObjectActionTypes,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
+  UpdateSectionDataSuccessAction
 } from './submission-objects.actions';
-import { SubmissionObjectEntry } from './submission-objects.reducer';
+import {SubmissionObjectEntry, SubmissionSectionError, SubmissionSectionObject} from './submission-objects.reducer';
+import { Item } from '../../core/shared/item.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import parseSectionErrorPaths, {SectionErrorPath} from '../utils/parseSectionErrorPaths';
+import { FormState } from '../../shared/form/form.reducer';
 
 @Injectable()
 export class SubmissionObjectEffects {
@@ -61,7 +77,12 @@ export class SubmissionObjectEffects {
         const sectionId = selfLink.substr(selfLink.lastIndexOf('/') + 1);
         const config = sectionDefinition._links.config ? (sectionDefinition._links.config.href || sectionDefinition._links.config) : '';
         const enabled = (sectionDefinition.mandatory) || (isNotEmpty(action.payload.sections) && action.payload.sections.hasOwnProperty(sectionId));
-        const sectionData = (isNotUndefined(action.payload.sections) && isNotUndefined(action.payload.sections[sectionId])) ? action.payload.sections[sectionId] : Object.create(null);
+        let sectionData;
+        if (sectionDefinition.sectionType !== SectionsType.SubmissionForm) {
+          sectionData = (isNotUndefined(action.payload.sections) && isNotUndefined(action.payload.sections[sectionId])) ? action.payload.sections[sectionId] : Object.create(null);
+        } else {
+          sectionData = action.payload.item.metadata;
+        }
         const sectionErrors = null;
         mappedActions.push(
           new InitSectionAction(
@@ -78,7 +99,7 @@ export class SubmissionObjectEffects {
           )
         )
       });
-      return {action: action, definition: definition, mappedActions: mappedActions};
+      return { action: action, definition: definition, mappedActions: mappedActions };
     }),
     mergeMap((result) => {
       return observableFrom(
@@ -99,6 +120,7 @@ export class SubmissionObjectEffects {
         action.payload.selfUrl,
         action.payload.submissionDefinition,
         action.payload.sections,
+        action.payload.item,
         null
       )));
 
@@ -112,7 +134,7 @@ export class SubmissionObjectEffects {
         this.submissionService.getSubmissionObjectLinkName(),
         action.payload.submissionId,
         'sections').pipe(
-        map((response: SubmissionObject[]) => new SaveSubmissionFormSuccessAction(action.payload.submissionId, response)),
+        map((response: SubmissionObject[]) => new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, action.payload.isManual)),
         catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
     }));
 
@@ -134,10 +156,24 @@ export class SubmissionObjectEffects {
    * Call parseSaveResponse and dispatch actions
    */
   @Effect() saveSubmissionSuccess$ = this.actions$.pipe(
-    ofType(SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS, SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS),
+    ofType(SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS),
     withLatestFrom(this.store$),
-    map(([action, currentState]: [SaveSubmissionFormSuccessAction | SaveSubmissionSectionFormSuccessAction, any]) => {
-      return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId], action.payload.submissionObject, action.payload.submissionId);
+    map(([action, currentState]: [SaveSubmissionFormSuccessAction, any]) => {
+      return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId],
+        action.payload.submissionObject, action.payload.submissionId, currentState.forms, action.payload.notify);
+    }),
+    mergeMap((actions) => observableFrom(actions)));
+
+  /**
+   * Call parseSaveResponse and dispatch actions.
+   * Notification system is forced to be disabled.
+   */
+  @Effect() saveSubmissionSectionSuccess$ = this.actions$.pipe(
+    ofType(SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS),
+    withLatestFrom(this.store$),
+    map(([action, currentState]: [SaveSubmissionSectionFormSuccessAction, any]) => {
+      return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId],
+        action.payload.submissionObject, action.payload.submissionId, currentState.forms, false);
     }),
     mergeMap((actions) => observableFrom(actions)));
 
@@ -159,7 +195,7 @@ export class SubmissionObjectEffects {
   /**
    * Show a notification on error
    */
-  @Effect({dispatch: false}) saveError$ = this.actions$.pipe(
+  @Effect({ dispatch: false }) saveError$ = this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_ERROR, SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_ERROR),
     withLatestFrom(this.store$),
     tap(() => this.notificationsService.error(null, this.translate.get('submission.sections.general.save_error_notice'))));
@@ -180,7 +216,8 @@ export class SubmissionObjectEffects {
             return new DepositSubmissionAction(action.payload.submissionId);
           } else {
             this.notificationsService.warning(null, this.translate.get('submission.sections.general.sections_not_valid'));
-            return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId], response, action.payload.submissionId);
+            return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId],
+              response, action.payload.submissionId, currentState.forms);
           }
         }),
         catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
@@ -195,13 +232,16 @@ export class SubmissionObjectEffects {
     switchMap(([action, state]: [DepositSubmissionAction, any]) => {
       return this.submissionService.depositSubmission(state.submission.objects[action.payload.submissionId].selfUrl).pipe(
         map(() => new DepositSubmissionSuccessAction(action.payload.submissionId)),
-        catchError(() => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
+        catchError((error) => {
+          console.log('submission error', error);
+          return observableOf(new DepositSubmissionErrorAction(action.payload.submissionId));
+        }));
     }));
 
   /**
    * Show a notification on success and redirect to MyDSpace page
    */
-  @Effect({dispatch: false}) saveForLaterSubmissionSuccess$ = this.actions$.pipe(
+  @Effect({ dispatch: false }) saveForLaterSubmissionSuccess$ = this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.SAVE_FOR_LATER_SUBMISSION_FORM_SUCCESS),
     tap(() => this.notificationsService.success(null, this.translate.get('submission.sections.general.save_success_notice'))),
     tap(() => this.submissionService.redirectToMyDSpace()));
@@ -209,7 +249,7 @@ export class SubmissionObjectEffects {
   /**
    * Show a notification on success and redirect to MyDSpace page
    */
-  @Effect({dispatch: false}) depositSubmissionSuccess$ = this.actions$.pipe(
+  @Effect({ dispatch: false }) depositSubmissionSuccess$ = this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_SUCCESS),
     tap(() => this.notificationsService.success(null, this.translate.get('submission.sections.general.deposit_success_notice'))),
     tap(() => this.submissionService.redirectToMyDSpace()));
@@ -217,7 +257,7 @@ export class SubmissionObjectEffects {
   /**
    * Show a notification on error
    */
-  @Effect({dispatch: false}) depositSubmissionError$ = this.actions$.pipe(
+  @Effect({ dispatch: false }) depositSubmissionError$ = this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_ERROR),
     tap(() => this.notificationsService.error(null, this.translate.get('submission.sections.general.deposit_error_notice'))));
 
@@ -232,10 +272,44 @@ export class SubmissionObjectEffects {
         catchError(() => observableOf(new DiscardSubmissionErrorAction(action.payload.submissionId))));
     }));
 
+  /**
+   * Adds all metadata an item to the SubmissionForm sections of the submission
+   */
+  @Effect() addAllMetadataToSectionData = this.actions$.pipe(
+    ofType(SubmissionObjectActionTypes.UPDATE_SECTION_DATA),
+    switchMap((action: UpdateSectionDataAction) => {
+      return this.sectionService.getSectionState(action.payload.submissionId, action.payload.sectionId, SectionsType.Upload)
+        .pipe(map((section: SubmissionSectionObject) => [action, section]), take(1));
+    }),
+    filter(([action, section]: [UpdateSectionDataAction, SubmissionSectionObject]) => section.sectionType === SectionsType.SubmissionForm),
+    switchMap(([action, section]: [UpdateSectionDataAction, SubmissionSectionObject]) => {
+      if (section.sectionType === SectionsType.SubmissionForm) {
+        const submissionObject$ = this.submissionObjectService
+          .findById(action.payload.submissionId, false, followLink('item')).pipe(
+            getFirstSucceededRemoteDataPayload()
+          );
+
+        const item$ = submissionObject$.pipe(
+          switchMap((submissionObject: SubmissionObject) => (submissionObject.item as Observable<RemoteData<Item>>).pipe(
+            getFirstSucceededRemoteDataPayload(),
+          )));
+
+        return item$.pipe(
+          map((item: Item) => item.metadata),
+          filter((metadata) => !isEqual(action.payload.data, metadata)),
+          map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errors, action.payload.metadata))
+        );
+      } else {
+        return observableOf(new UpdateSectionDataSuccessAction());
+      }
+    }),
+  );
+
   /**
    * Show a notification on success and redirect to MyDSpace page
    */
-  @Effect({dispatch: false}) discardSubmissionSuccess$ = this.actions$.pipe(
+  @Effect({ dispatch: false })
+  discardSubmissionSuccess$ = this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.DISCARD_SUBMISSION_SUCCESS),
     tap(() => this.notificationsService.success(null, this.translate.get('submission.sections.general.discard_success_notice'))),
     tap(() => this.submissionService.redirectToMyDSpace()));
@@ -243,7 +317,7 @@ export class SubmissionObjectEffects {
   /**
    * Show a notification on error
    */
-  @Effect({dispatch: false}) discardSubmissionError$ = this.actions$.pipe(
+  @Effect({ dispatch: false }) discardSubmissionError$ = this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.DISCARD_SUBMISSION_ERROR),
     tap(() => this.notificationsService.error(null, this.translate.get('submission.sections.general.discard_error_notice'))));
 
@@ -253,6 +327,7 @@ export class SubmissionObjectEffects {
               private sectionService: SectionsService,
               private store$: Store<any>,
               private submissionService: SubmissionService,
+              private submissionObjectService: SubmissionObjectDataService,
               private translate: TranslateService) {
   }
 
@@ -267,7 +342,7 @@ export class SubmissionObjectEffects {
 
     if (isNotEmpty(response)) {
       response.forEach((item: WorkspaceItem | WorkflowItem) => {
-        const {errors} = item;
+        const { errors } = item;
 
         if (errors && !isEmpty(errors)) {
           canDeposit = false;
@@ -295,6 +370,7 @@ export class SubmissionObjectEffects {
     currentState: SubmissionObjectEntry,
     response: SubmissionObject[],
     submissionId: string,
+    forms,
     notify: boolean = true): SubmissionObjectAction[] {
 
     const mappedActions = [];
@@ -307,7 +383,7 @@ export class SubmissionObjectEffects {
       response.forEach((item: WorkspaceItem | WorkflowItem) => {
 
         let errorsList = Object.create({});
-        const {errors} = item;
+        const { errors } = item;
 
         if (errors && !isEmpty(errors)) {
           // to avoid dispatching an action for every error, create an array of errors per section
@@ -334,14 +410,54 @@ export class SubmissionObjectEffects {
           if (notify && !currentState.sections[sectionId].enabled) {
             this.submissionService.notifyNewSection(submissionId, sectionId, currentState.sections[sectionId].sectionType);
           }
-          mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, sectionErrors));
-        }
 
+          const sectionForm = getForm(forms, currentState, sectionId);
+          const filteredErrors = filterErrors(sectionForm, sectionErrors, currentState.sections[sectionId].sectionType, notify);
+          mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, filteredErrors));
+        }
       });
-
     }
-
     return mappedActions;
   }
+}
 
+function getForm(forms, currentState, sectionId) {
+  if (!forms) {
+    return null;
+  }
+  const formId = currentState.sections[sectionId].formId;
+  return forms[formId];
+}
+
+/**
+ * Filter sectionErrors accordingly to this rules:
+ * 1. if notifications are enabled return all errors
+ * 2. if sectionType is different from 'submission-form' return all errors
+ * 3. otherwise return errors only for those fields marked as touched inside the section form
+ * @param sectionForm
+ *  The form related to the section
+ * @param sectionErrors
+ *  The section errors array
+ * @param sectionType
+ *  The section type
+ * @param notify
+ *  Whether notifications are enabled
+ */
+function filterErrors(sectionForm: FormState, sectionErrors: SubmissionSectionError[], sectionType: string, notify: boolean): SubmissionSectionError[] {
+  if (notify || sectionType !== SectionsType.SubmissionForm) {
+    return sectionErrors;
+  }
+  if (!sectionForm || !sectionForm.touched) {
+    return [];
+  }
+  const filteredErrors = [];
+  sectionErrors.forEach((error: SubmissionSectionError) => {
+    const errorPaths: SectionErrorPath[] = parseSectionErrorPaths(error.path);
+    errorPaths.forEach((path: SectionErrorPath) => {
+      if (path.fieldId && sectionForm.touched[path.fieldId]) {
+        filteredErrors.push(error);
+      }
+    });
+  });
+  return filteredErrors;
 }
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index e7f3a24c897..0431cdff79d 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -39,6 +39,7 @@ import {
   mockSubmissionSelfUrl,
   mockSubmissionState
 } from '../../shared/mocks/submission.mock';
+import { Item } from '../../core/shared/item.model';
 
 describe('submissionReducer test suite', () => {
 
@@ -67,7 +68,7 @@ describe('submissionReducer test suite', () => {
       }
     };
 
-    const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, []);
+    const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), []);
     const newState = submissionObjectReducer({}, action);
 
     expect(newState).toEqual(expectedState);
@@ -100,7 +101,7 @@ describe('submissionReducer test suite', () => {
       }
     };
 
-    const action = new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, {}, submissionDefinition);
+    const action = new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, {}, submissionDefinition, new Item());
     const newState = submissionObjectReducer(initState, action);
 
     expect(newState).toEqual(expectedState);
@@ -241,7 +242,7 @@ describe('submissionReducer test suite', () => {
       isValid: false
     } as any;
 
-    let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, []);
+    let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), []);
     let newState = submissionObjectReducer({}, action);
 
     action = new InitSectionAction(
@@ -334,6 +335,17 @@ describe('submissionReducer test suite', () => {
     expect(newState[826].sections.traditionalpageone.data).toEqual(data);
   });
 
+  it('should update submission section metadata properly', () => {
+    const data = {
+    } as any;
+    const metadata = ['dc.title', 'dc.contributor.author'];
+
+    const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, [], metadata);
+    const newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].sections.traditionalpageone.metadata).toEqual(metadata);
+  });
+
   it('should add submission section errors properly', () => {
     const errors = [
       {
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index e0aeefd7b61..9d2030ce258 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -30,6 +30,7 @@ import {
   SaveSubmissionSectionFormSuccessAction,
   SectionStatusChangeAction,
   SetActiveSectionAction,
+  SetSectionFormId,
   SubmissionObjectAction,
   SubmissionObjectActionTypes,
   UpdateSectionDataAction
@@ -85,6 +86,11 @@ export interface SubmissionSectionObject {
    */
   enabled: boolean;
 
+  /**
+   * The list of the metadata ids of the section.
+   */
+  metadata: string[];
+
   /**
    * The section data object
    */
@@ -104,6 +110,11 @@ export interface SubmissionSectionObject {
    * A boolean representing if this section is valid
    */
   isValid: boolean;
+
+  /**
+   * The formId related to this section
+   */
+  formId: string;
 }
 
 /**
@@ -258,11 +269,15 @@ export function submissionObjectReducer(state = initialState, action: Submission
       return initSection(state, action as InitSectionAction);
     }
 
+    case SubmissionObjectActionTypes.SET_SECTION_FORM_ID: {
+      return setSectionFormId(state, action as SetSectionFormId);
+    }
+
     case SubmissionObjectActionTypes.ENABLE_SECTION: {
       return changeSectionState(state, action as EnableSectionAction, true);
     }
 
-    case SubmissionObjectActionTypes.UPLOAD_SECTION_DATA: {
+    case SubmissionObjectActionTypes.UPDATE_SECTION_DATA: {
       return updateSectionData(state, action as UpdateSectionDataAction);
     }
 
@@ -641,6 +656,33 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
   }
 }
 
+/**
+ * Set a section form id.
+ *
+ * @param state
+ *    the current state
+ * @param action
+ *    an SetSectionFormId
+ * @return SubmissionObjectState
+ *    the new state
+ */
+function setSectionFormId(state: SubmissionObjectState, action: SetSectionFormId): SubmissionObjectState {
+  if (hasValue(state[ action.payload.submissionId ])) {
+    return Object.assign({}, state, {
+      [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
+        sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
+          [ action.payload.sectionId ]: {
+            ...state[ action.payload.submissionId ].sections [action.payload.sectionId],
+            formId: action.payload.formId
+          }
+        })
+      })
+    });
+  } else {
+    return state;
+  }
+}
+
 /**
  * Update section's data.
  *
@@ -653,14 +695,15 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
  */
 function updateSectionData(state: SubmissionObjectState, action: UpdateSectionDataAction): SubmissionObjectState {
   if (isNotEmpty(state[ action.payload.submissionId ])
-      && isNotEmpty(state[ action.payload.submissionId ].sections[ action.payload.sectionId])) {
+    && isNotEmpty(state[ action.payload.submissionId ].sections[ action.payload.sectionId])) {
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
           [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
             enabled: true,
             data: action.payload.data,
-            errors: action.payload.errors
+            errors: action.payload.errors,
+            metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata)
           })
         })
       })
@@ -670,6 +713,24 @@ function updateSectionData(state: SubmissionObjectState, action: UpdateSectionDa
   }
 }
 
+/**
+ * Updates the state of the section metadata only when a new value is provided.
+ * Keep the existent otherwise.
+ * @param newMetadata
+ * @param oldMetadata
+ * @return
+ *   new sectionMetadata value
+ */
+function reduceSectionMetadata(newMetadata: string[], oldMetadata: string[]): string[] {
+  if (newMetadata) {
+    return newMetadata;
+  }
+  if (oldMetadata) {
+    return [...oldMetadata];
+  }
+  return undefined;
+}
+
 /**
  * Set a section state.
  *
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
new file mode 100644
index 00000000000..20743540a87
--- /dev/null
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -0,0 +1,144 @@
+<div class="mb-4 ccLicense-select">
+  <ds-select
+    [disabled]="!submissionCcLicenses">
+
+    <ng-container class="selection">
+      <span *ngIf="!submissionCcLicenses">
+        <ds-loading></ds-loading>
+      </span>
+      <span *ngIf="getSelectedCcLicense()">
+        {{ getSelectedCcLicense().name }}
+      </span>
+      <span *ngIf="submissionCcLicenses && !getSelectedCcLicense()">
+        <ng-container *ngIf="storedCcLicenseLink">
+          {{ 'submission.sections.ccLicense.change' | translate }}
+        </ng-container>
+        <ng-container *ngIf="!storedCcLicenseLink">
+          {{ 'submission.sections.ccLicense.select' | translate }}
+        </ng-container>
+      </span>
+    </ng-container>
+
+    <ng-container class="menu">
+      <button *ngIf="submissionCcLicenses?.length == 0"
+              class="dropdown-item disabled">
+        {{ 'submission.sections.ccLicense.none' | translate }}
+      </button>
+      <button *ngFor="let license of submissionCcLicenses"
+              class="dropdown-item"
+              (click)="selectCcLicense(license)">
+        {{ license.name }}
+      </button>
+    </ng-container>
+
+  </ds-select>
+</div>
+
+<ng-container *ngIf="getSelectedCcLicense()">
+
+  <div *ngFor="let field of getSelectedCcLicense().fields"
+       class="mb-4">
+
+    <div class="d-flex flex-row">
+      <div class="font-weight-bold {{ field.id }}">
+        {{ field.label }}
+      </div>
+      <button
+        class="btn btn-outline-info btn-sm ml-2"
+        (click)="openInfoModal(infoModal)">
+        <i class="fas fa-question"></i>
+      </button>
+    </div>
+
+    <ng-template #infoModal>
+
+      <div>
+
+        <div class="modal-header mb-4 ">
+          <div>
+            <h4>
+              {{ field.label }}
+            </h4>
+            <div [innerHTML]="field.description"></div>
+          </div>
+          <button type="button" class="close"
+                  (click)="closeInfoModal()" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+
+        <div class="modal-body">
+          <div *ngFor="let value of field.enums"
+               class="mb-4">
+            <h5>
+              {{ value.label }}
+            </h5>
+            <div [innerHTML]="value.description" class="font-weight-light"></div>
+          </div>
+        </div>
+
+      </div>
+
+    </ng-template>
+
+    <ds-select *ngIf="field.enums?.length > 5">
+      <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
+        <span *ngIf="option">
+          {{ option.label }}
+        </span>
+        <span *ngIf="!option">
+          {{ 'submission.sections.ccLicense.option.select' | translate }}
+        </span>
+      </ng-container>
+      <ng-container class="menu">
+        <div class="options-select-menu overflow-auto">
+          <button *ngFor="let option of field.enums"
+                  class="dropdown-item"
+                  (click)="selectOption(getSelectedCcLicense(), field, option)">
+            {{ option.label }}
+          </button>
+        </div>
+      </ng-container>
+    </ds-select>
+
+    <ng-container *ngIf="field.enums?.length <= 5">
+      <div *ngFor="let option of field.enums"
+           class="d-flex flex-row m-1">
+        <div (click)="selectOption(getSelectedCcLicense(), field, option)">
+          <input type="radio"
+                 title="{{ option.label }}"
+                 class="mr-1"
+                 [checked]="isSelectedOption(getSelectedCcLicense(), field, option)">
+          <span>{{ option.label }}</span>
+        </div>
+      </div>
+    </ng-container>
+
+  </div>
+
+</ng-container>
+
+<ng-container *ngIf="getCcLicenseLink$()">
+  <ng-container *ngVar="getCcLicenseLink$() | async as licenseLink">
+    <div *ngIf="!licenseLink">
+      <ds-loading></ds-loading>
+    </div>
+    <div *ngIf="licenseLink"
+         class="mt-2 p-4 bg-light text-dark">
+      <div>
+        {{ 'submission.sections.ccLicense.link' | translate }}
+      </div>
+      <a class="license-link" href="{{ licenseLink }}" target="_blank" rel="noopener noreferrer">
+        {{ licenseLink }}
+      </a>
+      <div class="m-2">
+        <div (click)="setAccepted(!accepted)">
+          <input type="checkbox"
+                 title="accepted"
+                 [checked]="accepted">
+          <span>{{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
new file mode 100644
index 00000000000..62a902b79a3
--- /dev/null
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
@@ -0,0 +1,3 @@
+.options-select-menu {
+  max-height: 25vh;
+}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
new file mode 100644
index 00000000000..20ea337b380
--- /dev/null
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -0,0 +1,269 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SubmissionSectionCcLicensesComponent } from './submission-section-cc-licenses.component';
+import { SUBMISSION_CC_LICENSE } from '../../../core/submission/models/submission-cc-licence.resource-type';
+import { of as observableOf } from 'rxjs';
+import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { SharedModule } from '../../../shared/shared.module';
+import { SectionsService } from '../sections.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsType } from '../sections-type';
+import { TranslateModule } from '@ngx-translate/core';
+import { SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
+import { cold } from 'jasmine-marbles';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+
+describe('SubmissionSectionCcLicensesComponent', () => {
+
+  let component: SubmissionSectionCcLicensesComponent;
+  let fixture: ComponentFixture<SubmissionSectionCcLicensesComponent>;
+  let de: DebugElement;
+
+  const sectionObject: SectionDataObject = {
+    config: 'test config',
+    mandatory: true,
+    data: {},
+    errors: [],
+    header: 'test header',
+    id: 'test section id',
+    sectionType: SectionsType.SubmissionForm
+  };
+
+  const submissionCcLicenses: SubmissionCcLicence[] = [
+    {
+      id: 'test license id 1',
+      type: SUBMISSION_CC_LICENSE,
+      name: 'test license name 1',
+      fields: [
+        {
+          id: 'test-field-id-1a',
+          label: 'test field label 1a',
+          description: 'test field description 1a',
+          enums: [
+            {
+              id: 'test enum id 1a I',
+              label: 'test enum label 1a I',
+              description: 'test enum description 1a I',
+            },
+            {
+              id: 'test enum id 1a II',
+              label: 'test enum label 1a II',
+              description: 'test enum description 1a II',
+            },
+          ],
+        },
+        {
+          id: 'test-field-id-1b',
+          label: 'test field label 1b',
+          description: 'test field description 1b',
+          enums: [
+            {
+              id: 'test enum id 1b I',
+              label: 'test enum label 1b I',
+              description: 'test enum description 1b I',
+            },
+            {
+              id: 'test enum id 1b II',
+              label: 'test enum label 1b II',
+              description: 'test enum description 1b II',
+            },
+          ],
+        },
+      ],
+      _links: {
+        self: {
+          href: 'test link',
+        },
+      },
+    },
+    {
+      id: 'test license id 2',
+      type: SUBMISSION_CC_LICENSE,
+      name: 'test license name 2',
+      fields: [
+        {
+          id: 'test-field-id-2a',
+          label: 'test field label 2a',
+          description: 'test field description 2a',
+          enums: [
+            {
+              id: 'test enum id 2a I',
+              label: 'test enum label 2a I',
+              description: 'test enum description 2a I'
+            },
+            {
+              id: 'test enum id 2a II',
+              label: 'test enum label 2a II',
+              description: 'test enum description 2a II'
+            },
+          ],
+        },
+        {
+          id: 'test-field-id-2b',
+          label: 'test field label 2b',
+          description: 'test field description 2b',
+          enums: [
+            {
+              id: 'test enum id 2b I',
+              label: 'test enum label 2b I',
+              description: 'test enum description 2b I'
+            },
+            {
+              id: 'test enum id 2b II',
+              label: 'test enum label 2b II',
+              description: 'test enum description 2b II'
+            },
+          ],
+        },
+      ],
+      _links: {
+        self: {
+          href: 'test link',
+        },
+      },
+    },
+  ];
+
+  const submissionCcLicensesDataService = jasmine.createSpyObj('submissionCcLicensesDataService', {
+    findAll: createSuccessfulRemoteDataObject$(createPaginatedList(submissionCcLicenses)),
+  });
+
+  const submissionCcLicenseUrlDataService = jasmine.createSpyObj('submissionCcLicenseUrlDataService', {
+    getCcLicenseLink: createSuccessfulRemoteDataObject$(
+      {
+        url: 'test cc license link',
+      }
+    ),
+  });
+
+  const sectionService = {
+    getSectionState: () => {
+      return observableOf({});
+    },
+    setSectionStatus: () => undefined,
+    updateSectionData: (submissionId, sectionId, updatedData) => {
+      component.sectionData.data = updatedData;
+    }
+  };
+
+  const operationsBuilder = jasmine.createSpyObj('operationsBuilder', {
+    add: undefined,
+    remove: undefined,
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        SharedModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionSectionCcLicensesComponent,
+      ],
+      providers: [
+        { provide: SubmissionCcLicenseDataService, useValue: submissionCcLicensesDataService },
+        { provide: SubmissionCcLicenseUrlDataService, useValue: submissionCcLicenseUrlDataService },
+        { provide: SectionsService, useValue: sectionService },
+        { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
+        { provide: 'collectionIdProvider', useValue: 'test collection id' },
+        { provide: 'sectionDataProvider', useValue: sectionObject },
+        { provide: 'submissionIdProvider', useValue: 'test submission id' },
+      ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SubmissionSectionCcLicensesComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should display a dropdown with the different cc licenses', () => {
+    expect(
+      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText
+    ).toContain('test license name 1');
+    expect(
+      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText
+    ).toContain('test license name 2');
+  });
+
+  describe('when a license is selected', () => {
+
+    const ccLicence = submissionCcLicenses[1];
+
+    beforeEach(() => {
+      component.selectCcLicense(ccLicence);
+      fixture.detectChanges();
+    });
+
+    it('should display the selected cc license', () => {
+      expect(
+        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText
+      ).toContain('test license name 2');
+    });
+
+    it('should display all field labels of the selected cc license only', () => {
+      expect(de.query(By.css('div.test-field-id-1a'))).toBeNull();
+      expect(de.query(By.css('div.test-field-id-1b'))).toBeNull();
+      expect(de.query(By.css('div.test-field-id-2a'))).toBeTruthy();
+      expect(de.query(By.css('div.test-field-id-2b'))).toBeTruthy();
+    });
+
+    it('should not display a cc license link', () => {
+      expect(de.query(By.css('.license-link'))).toBeNull();
+    });
+
+    it('should have section status incomplete', () => {
+      expect(component.getSectionStatus()).toBeObservable(cold('(a|)', { a: false }));
+    });
+
+    describe('when all options have a value selected', () => {
+
+      beforeEach(() => {
+        component.selectOption(ccLicence, ccLicence.fields[0], ccLicence.fields[0].enums[1]);
+        component.selectOption(ccLicence, ccLicence.fields[1], ccLicence.fields[1].enums[0]);
+        fixture.detectChanges();
+      });
+
+      it('should call the submission cc licenses data service getCcLicenseLink method', () => {
+        expect(submissionCcLicenseUrlDataService.getCcLicenseLink).toHaveBeenCalledWith(
+          ccLicence,
+          new Map([
+            [ccLicence.fields[0], ccLicence.fields[0].enums[1]],
+            [ccLicence.fields[1], ccLicence.fields[1].enums[0]],
+          ])
+        );
+      });
+
+      it('should display a cc license link', () => {
+        expect(de.query(By.css('.license-link'))).toBeTruthy();
+      });
+
+      it('should not be accepted', () => {
+        expect(component.accepted).toBeFalse();
+      });
+
+      it('should have section status incomplete', () => {
+        expect(component.getSectionStatus()).toBeObservable(cold('(a|)', { a: false }));
+      });
+
+      describe('when the cc license is accepted', () => {
+
+        beforeEach(() => {
+          component.setAccepted(true);
+          fixture.detectChanges();
+        });
+
+        it('should have section status complete', () => {
+          expect(component.getSectionStatus()).toBeObservable(cold('(a|)', { a: true }));
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
new file mode 100644
index 00000000000..492fbf4a7e1
--- /dev/null
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -0,0 +1,283 @@
+import { Component, Inject } from '@angular/core';
+import { Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  Field,
+  Option,
+  SubmissionCcLicence
+} from '../../../core/submission/models/submission-cc-license.model';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { isNotEmpty } from '../../../shared/empty.util';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
+
+/**
+ * This component represents the submission section to select the Creative Commons license.
+ */
+@Component({
+  selector: 'ds-submission-section-cc-licenses',
+  templateUrl: './submission-section-cc-licenses.component.html',
+  styleUrls: ['./submission-section-cc-licenses.component.scss']
+})
+@renderSectionFor(SectionsType.CcLicense)
+export class SubmissionSectionCcLicensesComponent extends SectionModelComponent {
+
+  /**
+   * The form id
+   * @type {string}
+   */
+  public formId: string;
+
+  /**
+   * A boolean representing if this section is loading
+   * @type {boolean}
+   */
+  public isLoading = true;
+
+  /**
+   * The [JsonPatchOperationPathCombiner] object
+   * @type {JsonPatchOperationPathCombiner}
+   */
+  protected pathCombiner: JsonPatchOperationPathCombiner;
+
+  /**
+   * The list of Subscriptions this component subscribes to.
+   */
+  private subscriptions: Subscription[] = [];
+
+  /**
+   * Cache of the available Creative Commons licenses.
+   */
+  submissionCcLicenses: SubmissionCcLicence[];
+
+  /**
+   * Reference to NgbModal
+   */
+  protected modalRef: NgbModalRef;
+
+  /**
+   * The Creative Commons link saved in the workspace item.
+   */
+  get storedCcLicenseLink(): string {
+    return this.data.uri;
+  }
+
+  /**
+   * The accepted state for the selected Creative Commons license.
+   */
+  get accepted(): boolean {
+    if (this.data.accepted === undefined) {
+      return !!this.data.uri;
+    }
+    return this.data.accepted;
+  }
+
+  constructor(
+    protected modalService: NgbModal,
+    protected sectionService: SectionsService,
+    protected submissionCcLicensesDataService: SubmissionCcLicenseDataService,
+    protected submissionCcLicenseUrlDataService: SubmissionCcLicenseUrlDataService,
+    protected operationsBuilder: JsonPatchOperationsBuilder,
+    @Inject('collectionIdProvider') public injectedCollectionId: string,
+    @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
+    @Inject('submissionIdProvider') public injectedSubmissionId: string
+  ) {
+    super(
+      injectedCollectionId,
+      injectedSectionData,
+      injectedSubmissionId,
+    );
+  }
+
+  /**
+   * The data of this section.
+   */
+  get data(): WorkspaceitemSectionCcLicenseObject {
+    return this.sectionData.data as WorkspaceitemSectionCcLicenseObject;
+  }
+
+  /**
+   * Select a given Creative Commons license.
+   * @param ccLicense the Creative Commons license to select.
+   */
+  selectCcLicense(ccLicense: SubmissionCcLicence) {
+    if (!!this.getSelectedCcLicense() && this.getSelectedCcLicense().id === ccLicense.id) {
+      return;
+    }
+    this.setAccepted(false);
+    this.updateSectionData({
+      ccLicense: {
+        id: ccLicense.id,
+        fields: {},
+      },
+      uri: undefined,
+    });
+  }
+
+  /**
+   * Get the selected Creative Commons license.
+   */
+  getSelectedCcLicense(): SubmissionCcLicence {
+    if (!this.submissionCcLicenses || !this.data.ccLicense) {
+      return null;
+    }
+    return this.submissionCcLicenses.filter((ccLicense) => ccLicense.id === this.data.ccLicense.id)[0];
+  }
+
+  /**
+   * Select an option for a given license field.
+   * @param ccLicense   the related Creative Commons license.
+   * @param field       the field for which to select an option.
+   * @param option      the option to select.
+   */
+  selectOption(ccLicense: SubmissionCcLicence, field: Field, option: Option) {
+    if (this.isSelectedOption(ccLicense, field, option)) {
+      return;
+    }
+    this.updateSectionData({
+      ccLicense: {
+        id: ccLicense.id,
+        fields: Object.assign({}, this.data.ccLicense.fields, {
+          [field.id]: option
+        }),
+      },
+      accepted: false,
+    });
+  }
+
+  /**
+   * Get the selected option for a given license field.
+   * @param ccLicense   the related Creative Commons license.
+   * @param field       the field for which to get the selected option value.
+   */
+  getSelectedOption(ccLicense: SubmissionCcLicence, field: Field): Option {
+    return this.data.ccLicense.fields[field.id];
+  }
+
+  /**
+   * Whether a given option is selected for a given Creative Commons license field.
+   * @param ccLicense   the related Creative Commons license.
+   * @param field       the field for which to check whether the option is selected.
+   * @param option      the option for which to check whether it is selected.
+   */
+  isSelectedOption(ccLicense: SubmissionCcLicence, field: Field, option: Option): boolean {
+    return this.getSelectedOption(ccLicense, field) && this.getSelectedOption(ccLicense, field).id === option.id;
+  }
+
+  /**
+   * Get the link to the Creative Commons license corresponding with the selected options.
+   */
+  getCcLicenseLink$(): Observable<string> {
+
+    if (!!this.storedCcLicenseLink) {
+      return observableOf(this.storedCcLicenseLink);
+    }
+    if (!this.getSelectedCcLicense() || this.getSelectedCcLicense().fields.some(
+      (field) => !this.getSelectedOption(this.getSelectedCcLicense(), field))) {
+      return undefined;
+    }
+    const selectedCcLicense = this.getSelectedCcLicense();
+    return this.submissionCcLicenseUrlDataService.getCcLicenseLink(
+      selectedCcLicense,
+      new Map(selectedCcLicense.fields.map(
+        (field) => [field, this.getSelectedOption(selectedCcLicense, field)]
+      )),
+    );
+  }
+
+  /**
+   * Open a given info modal.
+   * @param content   the modal content.
+   */
+  openInfoModal(content) {
+    this.modalRef = this.modalService.open(content);
+  }
+
+  /**
+   * Close the info modal.
+   */
+  closeInfoModal() {
+    this.modalRef.close();
+  }
+
+  /**
+   * Get section status
+   *
+   * @return Observable<boolean>
+   *     the section status
+   */
+  getSectionStatus(): Observable<boolean> {
+    return observableOf(this.accepted);
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  onSectionDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+  }
+
+  /**
+   * Initialize the section.
+   */
+  onSectionInit(): void {
+    this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionData.id);
+    this.subscriptions.push(
+      this.sectionService.getSectionState(this.submissionId, this.sectionData.id, SectionsType.CcLicense).pipe(
+        filter((sectionState) => {
+          return isNotEmpty(sectionState) && (isNotEmpty(sectionState.data) || isNotEmpty(sectionState.errors))
+        }),
+        distinctUntilChanged(),
+        map((sectionState) => sectionState.data as WorkspaceitemSectionCcLicenseObject),
+      ).subscribe((data) => {
+        if (this.data.accepted !== data.accepted) {
+          const path = this.pathCombiner.getPath('uri');
+          if (data.accepted) {
+            this.getCcLicenseLink$().pipe(
+              take(1),
+            ).subscribe((link) => {
+              this.operationsBuilder.add(path, link.toString(), false, true);
+            });
+          } else if (!!this.data.uri) {
+            this.operationsBuilder.remove(path);
+          }
+        }
+        this.sectionData.data = data;
+      }),
+      this.submissionCcLicensesDataService.findAll({elementsPerPage: Number.MAX_SAFE_INTEGER}).pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        map((list) => list.page),
+      ).subscribe(
+        (licenses) => this.submissionCcLicenses = licenses
+      ),
+    );
+  }
+
+  /**
+   * Set the accepted state for the Creative Commons license.
+   * @param accepted  the accepted state for the cc license.
+   */
+  setAccepted(accepted: boolean) {
+    this.updateSectionData({
+      accepted
+    });
+    this.updateSectionStatus();
+  }
+
+  /**
+   * Update the section data for this section.
+   */
+  updateSectionData(data: WorkspaceitemSectionCcLicenseObject) {
+    this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, Object.assign({}, this.data, data));
+  }
+}
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index fb29f606e63..8262d51f6f0 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -3,6 +3,7 @@
      [ngClass]="{ 'section-focus' : sectionRef.isSectionActive() }"
      [mandatory]="sectionData.mandatory"
      [submissionId]="submissionId"
+     [sectionType]="sectionData.sectionType"
      [sectionId]="sectionData.id">
   <ngb-accordion #acc="ngbAccordion"
                  *ngIf="(sectionRef.isEnabled() | async)"
diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
index de8e7da7f9c..1156a7e237e 100644
--- a/src/app/submission/sections/form/section-form-operations.service.spec.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -27,7 +27,7 @@ import {
   mockRowGroupModel
 } from '../../../shared/mocks/form-models.mock';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { AuthorityValue } from '../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
 
 describe('SectionFormOperationsService test suite', () => {
   let formBuilderService: any;
@@ -365,7 +365,7 @@ describe('SectionFormOperationsService test suite', () => {
       event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: mockInputWithLanguageAndAuthorityModel
       });
-      expectedValue = Object.assign(new AuthorityValue(), mockInputWithLanguageAndAuthorityModel.value, {language: mockInputWithLanguageAndAuthorityModel.language});
+      expectedValue = Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityModel.value, {language: mockInputWithLanguageAndAuthorityModel.language});
 
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
@@ -373,7 +373,7 @@ describe('SectionFormOperationsService test suite', () => {
         model: mockInputWithLanguageAndAuthorityArrayModel
       });
       expectedValue = [
-        Object.assign(new AuthorityValue(), mockInputWithLanguageAndAuthorityArrayModel.value[0],
+        Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityArrayModel.value[0],
         { language: mockInputWithLanguageAndAuthorityArrayModel.language }
         )
       ];
@@ -665,7 +665,7 @@ describe('SectionFormOperationsService test suite', () => {
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/1');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
       spyOn(service, 'getFieldValueFromChangeEvent').and.returnValue(new FormFieldMetadataValueObject('test'));
-      spyOn(service, 'getArrayIndexFromEvent').and.returnValue(1);
+      spyOn(service, 'getArrayIndexFromEvent').and.returnValue(0);
       spyOn(serviceAsAny, 'getValueMap');
       spyOn(serviceAsAny, 'dispatchOperationsFromMap');
       formBuilderService.isQualdropGroup.and.returnValue(false);
@@ -676,8 +676,10 @@ describe('SectionFormOperationsService test suite', () => {
       serviceAsAny.dispatchOperationsFromChangeEvent(pathCombiner, event, previousValue, false);
 
       expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath('path/1'),
-        new FormFieldMetadataValueObject('test'));
+        pathCombiner.getPath('path'),
+        new FormFieldMetadataValueObject('test'),
+        true
+      );
     });
   });
 
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
index 2d6b1c54773..5c242f2b830 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -9,17 +9,27 @@ import {
   DynamicFormControlModel
 } from '@ng-dynamic-forms/core';
 
-import { isNotEmpty, isNotNull, isNotUndefined, isNull, isUndefined } from '../../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+  isNull,
+  isUndefined
+} from '../../../shared/empty.util';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
 import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { AuthorityValue } from '../../../core/integration/models/authority.value';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { DynamicQualdropModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { DynamicRelationGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { deepClone } from 'fast-json-patch';
 
 /**
  * The service handling all form section operations
@@ -61,6 +71,9 @@ export class SectionFormOperationsService {
       case 'change':
         this.dispatchOperationsFromChangeEvent(pathCombiner, event, previousValue, hasStoredValue);
         break;
+      case 'add':
+        this.dispatchOperationsFromAddEvent(pathCombiner, event);
+        break;
       default:
         break;
     }
@@ -173,7 +186,7 @@ export class SectionFormOperationsService {
         metadataValueMap.set(groupModel.qualdropId, metadataValueList);
       }
       if (index === fieldIndex) {
-        path = groupModel.qualdropId + '/' + (metadataValueMap.get(groupModel.qualdropId).length - 1)
+        path = groupModel.qualdropId + '/' + (metadataValueList.length - 1)
       }
     });
 
@@ -221,18 +234,19 @@ export class SectionFormOperationsService {
       if ((event.model as DsDynamicInputModel).hasAuthority) {
         if (Array.isArray(value)) {
           value.forEach((authority, index) => {
-            authority = Object.assign(new AuthorityValue(), authority, { language });
+            authority = Object.assign(new VocabularyEntry(), authority, { language });
             value[index] = authority;
           });
           fieldValue = value;
         } else {
-          fieldValue = Object.assign(new AuthorityValue(), value, { language });
+          fieldValue = Object.assign(new VocabularyEntry(), value, { language });
         }
       } else {
         // Language without Authority (input, textArea)
         fieldValue = new FormFieldMetadataValueObject(value, language);
       }
-    } else if (value instanceof FormFieldLanguageValueObject || value instanceof AuthorityValue || isObject(value)) {
+    } else if (value instanceof FormFieldLanguageValueObject || value instanceof VocabularyEntry
+      || value instanceof VocabularyEntryDetail || isObject(value)) {
       fieldValue = value;
     } else {
       fieldValue = new FormFieldMetadataValueObject(value);
@@ -286,6 +300,42 @@ export class SectionFormOperationsService {
     }
   }
 
+  /**
+   * Handle form add operations
+   *
+   * @param pathCombiner
+   *    the [[JsonPatchOperationPathCombiner]] object for the specified operation
+   * @param event
+   *    the [[DynamicFormControlEvent]] for the specified operation
+   */
+  protected dispatchOperationsFromAddEvent(
+    pathCombiner: JsonPatchOperationPathCombiner,
+    event: DynamicFormControlEvent
+  ): void {
+    const path = this.getFieldPathSegmentedFromChangeEvent(event);
+    const value = deepClone(this.getFieldValueFromChangeEvent(event));
+    if (isNotEmpty(value)) {
+      value.place = this.getArrayIndexFromEvent(event);
+      if (hasValue(event.group) && hasValue(event.group.value)) {
+        const valuesInGroup = event.group.value
+          .map((g) => Object.values(g))
+          .reduce((accumulator, currentValue) => accumulator.concat(currentValue))
+          .filter((v) => isNotEmpty(v));
+        if (valuesInGroup.length === 1) {
+          // The first add for a field needs to be a different PATCH operation
+          // for some reason
+          this.operationsBuilder.add(
+            pathCombiner.getPath([path]),
+            [value], false);
+        } else {
+          this.operationsBuilder.add(
+            pathCombiner.getPath([path, '-']),
+            value, false);
+        }
+      }
+    }
+  }
+
   /**
    * Handle form change operations
    *
@@ -312,14 +362,29 @@ export class SectionFormOperationsService {
     } else if (this.formBuilder.isRelationGroup(event.model)) {
       // It's a relation model
       this.dispatchOperationsFromMap(this.getValueMap(value), pathCombiner, event, previousValue);
-    } else if (this.formBuilder.hasArrayGroupValue(event.model)) {
+    } else if (this.formBuilder.hasArrayGroupValue(event.model) && hasNoValue((event.model as any).relationshipConfig)) {
       // Model has as value an array, so dispatch an add operation with entire block of values
       this.operationsBuilder.add(
         pathCombiner.getPath(segmentedPath),
         value, true);
     } else if (previousValue.isPathEqual(this.formBuilder.getPath(event.model)) || hasStoredValue) {
       // Here model has a previous value changed or stored in the server
-      if (!value.hasValue()) {
+      if (hasValue(event.$event) && hasValue(event.$event.previousIndex)) {
+        if (event.$event.previousIndex < 0) {
+          this.operationsBuilder.add(
+            pathCombiner.getPath(segmentedPath),
+            value, true);
+        } else {
+          const moveTo = pathCombiner.getPath(path);
+          const moveFrom = pathCombiner.getPath(segmentedPath + '/' + event.$event.previousIndex);
+          if (isNotEmpty(moveFrom.path) && isNotEmpty(moveTo.path) && moveFrom.path !== moveTo.path) {
+            this.operationsBuilder.move(
+              moveTo,
+              moveFrom.path
+            )
+          }
+        }
+      } else if (!value.hasValue()) {
         // New value is empty, so dispatch a remove operation
         if (this.getArrayIndexFromEvent(event) === 0) {
           this.operationsBuilder.remove(pathCombiner.getPath(segmentedPath));
@@ -333,22 +398,13 @@ export class SectionFormOperationsService {
           value);
       }
       previousValue.delete();
-    } else if (value.hasValue()) {
-      // Here model has no previous value but a new one
-      if (isUndefined(this.getArrayIndexFromEvent(event))
-        || this.getArrayIndexFromEvent(event) === 0) {
+    } else if (value.hasValue() && (isUndefined(this.getArrayIndexFromEvent(event))
+        || this.getArrayIndexFromEvent(event) === 0)) {
         // Model is single field or is part of an array model but is the first item,
         // so dispatch an add operation that initialize the values of a specific metadata
         this.operationsBuilder.add(
           pathCombiner.getPath(segmentedPath),
           value, true);
-      } else {
-        // Model is part of an array model but is not the first item,
-        // so dispatch an add operation that add a value to an existent metadata
-        this.operationsBuilder.add(
-          pathCombiner.getPath(path),
-          value);
-      }
     }
   }
 
diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index c8c0d671ecf..d649f985ca7 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -32,8 +32,6 @@ import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
-import { ConfigData } from '../../../core/config/config-data';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { DynamicRowGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
@@ -41,13 +39,19 @@ import { SubmissionSectionError } from '../../objects/submission-objects.reducer
 import { DynamicFormControlEvent, DynamicFormControlEventType } from '@ng-dynamic-forms/core';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService {
   return jasmine.createSpyObj('FormOperationsService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
     getConfigByName: jasmine.createSpy('getConfigByName'),
-    getConfigBySearch: jasmine.createSpy('getConfigBySearch')
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
+    findByHref: jasmine.createSpy('findByHref'),
   });
 }
 
@@ -114,11 +118,11 @@ const testFormConfiguration = {
 const testFormModel = [
   new DynamicRowGroupModel({
     id: 'df-row-group-config-1',
-    group: [new DsDynamicInputModel({ id: 'dc.title', metadataFields: [], repeatable: false, submissionId: '1234' })],
+    group: [new DsDynamicInputModel({ id: 'dc.title', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false })],
   }),
   new DynamicRowGroupModel({
     id: 'df-row-group-config-2',
-    group: [new DsDynamicInputModel({ id: 'dc.contributor', metadataFields: [], repeatable: false, submissionId: '1234' })],
+    group: [new DsDynamicInputModel({ id: 'dc.contributor', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false })],
   })
 ];
 
@@ -148,7 +152,6 @@ describe('SubmissionSectionformComponent test suite', () => {
   const submissionId = mockSubmissionId;
   const collectionId = mockSubmissionCollectionId;
   const parsedSectionErrors: any = mockUploadResponse1ParsedErrors.traditionalpageone;
-  const formConfigData = new ConfigData(new PageInfo(), testFormConfiguration);
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -173,9 +176,12 @@ describe('SubmissionSectionformComponent test suite', () => {
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },
         { provide: TranslateService, useValue: getMockTranslateService() },
+        { provide: ObjectCacheService, useValue: { remove: () => {/*do nothing*/}, hasBySelfLinkObservable: () => observableOf(false), hasByHref$: () => observableOf(false) } },
+        { provide: RequestService, useValue: { removeByHrefSubstring: () => {/*do nothing*/}, hasByHref$: () => observableOf(false) } },
         { provide: 'collectionIdProvider', useValue: collectionId },
         { provide: 'sectionDataProvider', useValue: sectionObject },
         { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: SubmissionObjectDataService, useValue: { getHrefByID: () => observableOf('testUrl'), findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem()) } },
         ChangeDetectorRef,
         SubmissionSectionformComponent
       ],
@@ -234,7 +240,7 @@ describe('SubmissionSectionformComponent test suite', () => {
     it('should init section properly', () => {
       const sectionData = {};
       formService.isValid.and.returnValue(observableOf(true));
-      formConfigService.getConfigByHref.and.returnValue(observableOf(formConfigData));
+      formConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(testFormConfiguration));
       sectionsServiceStub.getSectionData.and.returnValue(observableOf(sectionData));
       spyOn(comp, 'initForm');
       spyOn(comp, 'subscriptions');
@@ -242,13 +248,12 @@ describe('SubmissionSectionformComponent test suite', () => {
       comp.onSectionInit();
       fixture.detectChanges();
 
-      expect(compAsAny.formConfig).toEqual(formConfigData.payload);
+      expect(compAsAny.formConfig).toEqual(testFormConfiguration);
       expect(comp.sectionData.errors).toEqual([]);
       expect(comp.sectionData.data).toEqual(sectionData);
       expect(comp.isLoading).toBeFalsy();
       expect(comp.initForm).toHaveBeenCalledWith(sectionData);
       expect(comp.subscriptions).toHaveBeenCalled();
-
     });
 
     it('should init form model properly', () => {
@@ -282,6 +287,7 @@ describe('SubmissionSectionformComponent test suite', () => {
         'dc.title': [new FormFieldMetadataValueObject('test')]
       };
       compAsAny.formData = {};
+      compAsAny.sectionMetadata = ['dc.title'];
 
       expect(comp.hasMetadataEnrichment(newSectionData)).toBeTruthy();
     });
@@ -291,7 +297,16 @@ describe('SubmissionSectionformComponent test suite', () => {
         'dc.title': [new FormFieldMetadataValueObject('test')]
       };
       compAsAny.formData = newSectionData;
+      compAsAny.sectionMetadata = ['dc.title'];
+      expect(comp.hasMetadataEnrichment(newSectionData)).toBeFalsy();
+    });
 
+    it('should return false when metadata has Metadata Enrichment but not belonging to sectionMetadata', () => {
+      const newSectionData = {
+        'dc.title': [new FormFieldMetadataValueObject('test')]
+      };
+      compAsAny.formData = newSectionData;
+      compAsAny.sectionMetadata = [];
       expect(comp.hasMetadataEnrichment(newSectionData)).toBeFalsy();
     });
 
@@ -305,13 +320,13 @@ describe('SubmissionSectionformComponent test suite', () => {
       comp.sectionData.data = {};
       comp.sectionData.errors = [];
       compAsAny.formData = {};
+      compAsAny.sectionMetadata = ['dc.title'];
 
       comp.updateForm(sectionData, sectionError);
 
       expect(comp.isUpdating).toBeFalsy();
       expect(comp.initForm).toHaveBeenCalled();
       expect(comp.checksForErrors).toHaveBeenCalled();
-      expect(notificationsServiceStub.info).toHaveBeenCalled();
       expect(comp.sectionData.data).toEqual(sectionData);
 
     });
@@ -325,6 +340,7 @@ describe('SubmissionSectionformComponent test suite', () => {
       comp.sectionData.data = {};
       comp.sectionData.errors = [];
       compAsAny.formData = sectionData;
+      compAsAny.sectionMetadata = ['dc.title'];
 
       comp.updateForm(sectionData, parsedSectionErrors);
 
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 58cda897b0e..1f37be89e25 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -1,23 +1,33 @@
 import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core';
 import { DynamicFormControlEvent, DynamicFormControlModel } from '@ng-dynamic-forms/core';
 
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, find, flatMap, map, take, tap } from 'rxjs/operators';
+import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  flatMap,
+  map,
+  switchMap,
+  take,
+  tap
+} from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
-import { isEqual } from 'lodash';
+import { isEqual, findIndex } from 'lodash';
 
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
 import { SectionModelComponent } from '../models/section.model';
 import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
-import { hasValue, isNotEmpty, isUndefined } from '../../../shared/empty.util';
-import { ConfigData } from '../../../core/config/config-data';
+import { hasNoValue, hasValue, isNotEmpty, isUndefined } from '../../../shared/empty.util';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { SubmissionSectionError, SubmissionSectionObject } from '../../objects/submission-objects.reducer';
+import {
+  SubmissionSectionError,
+  SubmissionSectionObject
+} from '../../objects/submission-objects.reducer';
 import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
-import { GlobalConfig } from '../../../../config/global-config.interface';
 import { SectionDataObject } from '../models/section-data.model';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionsType } from '../sections-type';
@@ -27,11 +37,16 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { SectionsService } from '../sections.service';
 import { difference } from '../../../shared/object.util';
 import { WorkspaceitemSectionFormObject } from '../../../core/submission/models/workspaceitem-section-form.model';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { combineLatest as combineLatestObservable } from 'rxjs';
-import { getSucceededRemoteData } from '../../../core/shared/operators';
-import { RemoteData } from '../../../core/data/remote-data';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
+import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { environment } from '../../../../environments/environment';
+import { ConfigObject } from '../../../core/config/models/config.model';
+import { RemoteData } from '../../../core/data/remote-data';
 
 /**
  * This component represents a section that contains a Form.
@@ -86,6 +101,12 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
    */
   protected formData: any = Object.create({});
 
+  /**
+   * Store the
+   * @protected
+   */
+  protected sectionMetadata: string[];
+
   /**
    * The [JsonPatchOperationPathCombiner] object
    * @type {JsonPatchOperationPathCombiner}
@@ -104,6 +125,7 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
    */
   protected subs: Subscription[] = [];
 
+  protected workspaceItem: WorkspaceItem;
   /**
    * The FormComponent reference
    */
@@ -121,7 +143,9 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
    * @param {SectionsService} sectionService
    * @param {SubmissionService} submissionService
    * @param {TranslateService} translate
-   * @param {GlobalConfig} EnvConfig
+   * @param {SubmissionObjectDataService} submissionObjectService
+   * @param {ObjectCacheService} objectCache
+   * @param {RequestService} requestService
    * @param {string} injectedCollectionId
    * @param {SectionDataObject} injectedSectionData
    * @param {string} injectedSubmissionId
@@ -135,6 +159,9 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
               protected sectionService: SectionsService,
               protected submissionService: SubmissionService,
               protected translate: TranslateService,
+              protected submissionObjectService: SubmissionObjectDataService,
+              protected objectCache: ObjectCacheService,
+              protected requestService: RequestService,
               @Inject('collectionIdProvider') public injectedCollectionId: string,
               @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
               @Inject('submissionIdProvider') public injectedSubmissionId: string) {
@@ -147,14 +174,33 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
   onSectionInit() {
     this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionData.id);
     this.formId = this.formService.getUniqueId(this.sectionData.id);
-    this.formConfigService.getConfigByHref(this.sectionData.config).pipe(
-      map((configData: ConfigData) => configData.payload),
+    this.sectionService.dispatchSetSectionFormId(this.submissionId, this.sectionData.id, this.formId);
+    this.formConfigService.findByHref(this.sectionData.config).pipe(
+      map((configData: RemoteData<ConfigObject>) => configData.payload),
       tap((config: SubmissionFormsModel) => this.formConfig = config),
-      flatMap(() => this.sectionService.getSectionData(this.submissionId, this.sectionData.id)),
+      flatMap(() =>
+        observableCombineLatest(
+          this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType),
+          this.submissionObjectService.getHrefByID(this.submissionId).pipe(take(1)).pipe(
+            switchMap((href: string) => {
+              this.objectCache.remove(href);
+              this.requestService.removeByHrefSubstring(this.submissionId);
+              return observableCombineLatest(
+                this.objectCache.hasByHref$(href),
+                this.requestService.hasByHref$(href)
+              ).pipe(
+                filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
+                take(1),
+                switchMap(() => this.submissionObjectService.findById(this.submissionId, false, followLink('item')).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload()) as Observable<SubmissionObject>)
+              )
+            })
+          )
+        )),
       take(1))
-      .subscribe((sectionData: WorkspaceitemSectionFormObject) => {
+      .subscribe(([sectionData, workspaceItem]: [WorkspaceitemSectionFormObject, WorkspaceItem]) => {
         if (isUndefined(this.formModel)) {
           this.sectionData.errors = [];
+          this.workspaceItem = workspaceItem;
           // Is the first loading so init form
           this.initForm(sectionData);
           this.sectionData.data = sectionData;
@@ -191,16 +237,25 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
    *    the section data retrieved from the server
    */
   hasMetadataEnrichment(sectionData: WorkspaceitemSectionFormObject): boolean {
+
+    const sectionDataToCheck = {};
+    Object.keys(sectionData).forEach((key) => {
+      if (this.sectionMetadata && this.sectionMetadata.includes(key)) {
+        sectionDataToCheck[key] = sectionData[key];
+      }
+    })
+
     const diffResult = [];
 
     // compare current form data state with section data retrieved from store
-    const diffObj = difference(sectionData, this.formData);
+    const diffObj = difference(sectionDataToCheck, this.formData);
 
     // iterate over differences to check whether they are actually different
     Object.keys(diffObj)
       .forEach((key) => {
         diffObj[key].forEach((value) => {
-          if (value.hasOwnProperty('value')) {
+          // the findIndex extra check excludes values already present in the form but in different positions
+          if (value.hasOwnProperty('value') && findIndex(this.formData[key], { value: value.value }) < 0) {
             diffResult.push(value);
           }
         });
@@ -223,6 +278,9 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
         sectionData,
         this.submissionService.getSubmissionScope()
       );
+      const sectionMetadata = this.sectionService.computeSectionConfiguredMetadata(this.formConfig);
+      this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, [], sectionMetadata);
+
     } catch (e) {
       const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
       const sectionError: SubmissionSectionError = {
@@ -247,10 +305,6 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
     if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data)) {
       this.sectionData.data = sectionData;
       if (this.hasMetadataEnrichment(sectionData)) {
-        const msg = this.translate.instant(
-          'submission.sections.general.metadata-extracted',
-          { sectionId: this.sectionData.id });
-        this.notificationsService.info(null, msg, null, true);
         this.isUpdating = true;
         this.formModel = null;
         this.cdr.detectChanges();
@@ -300,13 +354,14 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
       /**
        * Subscribe to section state
        */
-      this.sectionService.getSectionState(this.submissionId, this.sectionData.id).pipe(
+      this.sectionService.getSectionState(this.submissionId, this.sectionData.id, this.sectionData.sectionType).pipe(
         filter((sectionState: SubmissionSectionObject) => {
           return isNotEmpty(sectionState) && (isNotEmpty(sectionState.data) || isNotEmpty(sectionState.errors))
         }),
         distinctUntilChanged())
         .subscribe((sectionState: SubmissionSectionObject) => {
           this.fieldsOnTheirWayToBeRemoved = new Map();
+          this.sectionMetadata = sectionState.metadata;
           this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errors);
         })
     )
@@ -320,16 +375,19 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
    *    the [[DynamicFormControlEvent]] emitted
    */
   onChange(event: DynamicFormControlEvent): void {
-    this.formOperationsService.dispatchOperationsFromEvent(
-      this.pathCombiner,
-      event,
-      this.previousValue,
-      this.hasStoredValue(this.formBuilderService.getId(event.model), this.formOperationsService.getArrayIndexFromEvent(event)));
-    const metadata = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event);
-    const value = this.formOperationsService.getFieldValueFromChangeEvent(event);
-
-    if (environment.submission.autosave.metadata.indexOf(metadata) !== -1 && isNotEmpty(value)) {
-      this.submissionService.dispatchSave(this.submissionId);
+    // don't handle change events for things with an index < 0, those are template rows.
+    if (hasNoValue(event.context) || hasNoValue(event.context.index) || event.context.index >= 0) {
+      this.formOperationsService.dispatchOperationsFromEvent(
+        this.pathCombiner,
+        event,
+        this.previousValue,
+        this.hasStoredValue(this.formBuilderService.getId(event.model), this.formOperationsService.getArrayIndexFromEvent(event)));
+      const metadata = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event);
+      const value = this.formOperationsService.getFieldValueFromChangeEvent(event);
+
+      if (environment.submission.autosave.metadata.indexOf(metadata) !== -1 && isNotEmpty(value)) {
+        this.submissionService.dispatchSave(this.submissionId);
+      }
     }
   }
 
diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index e6915112e5f..892ee20f12e 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -133,7 +133,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
       (model as DynamicCheckboxModel).valueUpdates.next(false);
     }
 
-    this.licenseText$ = this.collectionDataService.findById(this.collectionId, followLink('license')).pipe(
+    this.licenseText$ = this.collectionDataService.findById(this.collectionId, true, followLink('license')).pipe(
       filter((collectionData: RemoteData<Collection>) => isNotUndefined((collectionData.payload))),
       flatMap((collectionData: RemoteData<Collection>) => (collectionData.payload as any).license),
       find((licenseData: RemoteData<License>) => isNotUndefined((licenseData.payload))),
diff --git a/src/app/submission/sections/sections.directive.ts b/src/app/submission/sections/sections.directive.ts
index 0efb7225aa8..1b0a6bfbc6e 100644
--- a/src/app/submission/sections/sections.directive.ts
+++ b/src/app/submission/sections/sections.directive.ts
@@ -9,6 +9,7 @@ import { hasValue, isNotEmpty, isNotNull } from '../../shared/empty.util';
 import { SubmissionSectionError, SubmissionSectionObject } from '../objects/submission-objects.reducer';
 import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
 import { SubmissionService } from '../submission.service';
+import { SectionsType } from './sections-type';
 
 /**
  * Directive for handling generic section functionality
@@ -31,6 +32,12 @@ export class SectionsDirective implements OnDestroy, OnInit {
    */
   @Input() sectionId: string;
 
+  /**
+   * The section type
+   * @type {SectionsType}
+   */
+  @Input() sectionType: SectionsType;
+
   /**
    * The submission id
    * @type {string}
@@ -104,7 +111,7 @@ export class SectionsDirective implements OnDestroy, OnInit {
       }));
 
     this.subs.push(
-      this.sectionService.getSectionState(this.submissionId, this.sectionId).pipe(
+      this.sectionService.getSectionState(this.submissionId, this.sectionId, this.sectionType).pipe(
         map((state: SubmissionSectionObject) => state.errors))
         .subscribe((errors: SubmissionSectionError[]) => {
           if (isNotEmpty(errors)) {
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index 1455a66f78e..75b6dfe67ea 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -14,7 +14,11 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { SectionsService } from './sections.service';
-import { mockSectionsData, mockSectionsErrors, mockSubmissionState } from '../../shared/mocks/submission.mock';
+import {
+  mockSectionsData,
+  mockSectionsErrors,
+  mockSubmissionState
+} from '../../shared/mocks/submission.mock';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -23,12 +27,17 @@ import {
   SectionStatusChangeAction,
   UpdateSectionDataAction
 } from '../objects/submission-objects.actions';
-import { FormAddError, FormClearErrorsAction, FormRemoveErrorAction } from '../../shared/form/form.actions';
+import {
+  FormAddError,
+  FormClearErrorsAction,
+  FormRemoveErrorAction
+} from '../../shared/form/form.actions';
 import parseSectionErrors from '../utils/parseSectionErrors';
 import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
 import { SubmissionSectionError } from '../objects/submission-objects.reducer';
 import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
 import { storeModuleConfig } from '../../app.reducer';
+import { SectionsType } from './sections-type';
 
 describe('SectionsService test suite', () => {
   let notificationsServiceStub: NotificationsServiceStub;
@@ -151,7 +160,7 @@ describe('SectionsService test suite', () => {
         b: sectionData[sectionId]
       });
 
-      expect(service.getSectionData(submissionId, sectionId)).toBeObservable(expected);
+      expect(service.getSectionData(submissionId, sectionId, SectionsType.SubmissionForm)).toBeObservable(expected);
     });
   });
 
@@ -175,7 +184,7 @@ describe('SectionsService test suite', () => {
         b: sectionState
       });
 
-      expect(service.getSectionState(submissionId, sectionId)).toBeObservable(expected);
+      expect(service.getSectionState(submissionId, sectionId, SectionsType.SubmissionForm)).toBeObservable(expected);
     });
   });
 
@@ -368,8 +377,28 @@ describe('SectionsService test suite', () => {
       scheduler.schedule(() => service.updateSectionData(submissionId, sectionId, data, []));
       scheduler.flush();
 
-      expect(notificationsServiceStub.info).toHaveBeenCalled();
       expect(store.dispatch).toHaveBeenCalledWith(new UpdateSectionDataAction(submissionId, sectionId, data, []));
     });
   });
+
+  describe('computeSectionConfiguredMetadata', () => {
+    it('should return the configured metadata of the section from the form configuration', () => {
+
+      const formConfig = {
+        rows: [{
+          fields: [{
+            selectableMetadata: [{
+              metadata: 'dc.contributor.author'
+            }]
+          }]
+        }]
+      }
+
+      const expectedConfiguredMetadata =  [ 'dc.contributor.author' ];
+
+      const configuredMetadata = service.computeSectionConfiguredMetadata(formConfig as any);
+
+      expect(configuredMetadata).toEqual(expectedConfiguredMetadata);
+    });
+  });
 });
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index f6ad5ef0cf0..a38d7d6981e 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -15,6 +15,7 @@ import {
   InertSectionErrorsAction,
   RemoveSectionErrorsAction,
   SectionStatusChangeAction,
+  SetSectionFormId,
   UpdateSectionDataAction
 } from '../objects/submission-objects.actions';
 import {
@@ -34,6 +35,10 @@ import { FormAddError, FormClearErrorsAction, FormRemoveErrorAction } from '../.
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionService } from '../submission.service';
 import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
+import { SectionsType } from './sections-type';
+import { normalizeSectionData } from '../../core/submission/submission-response-parsing.service';
+import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+import { parseReviver } from '@ng-dynamic-forms/core';
 
 /**
  * A service that provides methods used in submission process.
@@ -131,6 +136,18 @@ export class SectionsService {
     this.store.dispatch(new RemoveSectionErrorsAction(submissionId, sectionId));
   }
 
+  /**
+   * Dispatch a new [SetSectionFormId]
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @param formId
+   *    The form id
+   */
+  public dispatchSetSectionFormId(submissionId, sectionId, formId) {
+    this.store.dispatch(new SetSectionFormId(submissionId, sectionId, formId));
+  }
+
   /**
    * Return the data object for the specified section
    *
@@ -138,12 +155,22 @@ export class SectionsService {
    *    The submission id
    * @param sectionId
    *    The section id
+   * @param sectionType
+   *    The type of section to retrieve
    * @return Observable<WorkspaceitemSectionDataType>
    *    observable of [WorkspaceitemSectionDataType]
    */
-  public getSectionData(submissionId: string, sectionId: string): Observable<WorkspaceitemSectionDataType> {
+  public getSectionData(submissionId: string, sectionId: string, sectionType: SectionsType): Observable<WorkspaceitemSectionDataType> {
     return this.store.select(submissionSectionDataFromIdSelector(submissionId, sectionId)).pipe(
-      distinctUntilChanged());
+      map((sectionData: WorkspaceitemSectionDataType) => {
+        if (sectionType === SectionsType.SubmissionForm) {
+          return normalizeSectionData(sectionData)
+        } else {
+          return sectionData;
+        }
+      }),
+      distinctUntilChanged(),
+    );
   }
 
   /**
@@ -168,14 +195,26 @@ export class SectionsService {
    *    The submission id
    * @param sectionId
    *    The section id
+   * @param sectionType
+   *    The type of section to retrieve
    * @return Observable<SubmissionSectionObject>
    *    observable of [SubmissionSectionObject]
    */
-  public getSectionState(submissionId: string, sectionId: string): Observable<SubmissionSectionObject> {
+  public getSectionState(submissionId: string, sectionId: string, sectionType: SectionsType): Observable<SubmissionSectionObject> {
     return this.store.select(submissionSectionFromIdSelector(submissionId, sectionId)).pipe(
       filter((sectionObj: SubmissionSectionObject) => hasValue(sectionObj)),
       map((sectionObj: SubmissionSectionObject) => sectionObj),
-      distinctUntilChanged());
+      map((sectionState: SubmissionSectionObject) => {
+        if (hasValue(sectionState.data) && sectionType === SectionsType.SubmissionForm) {
+          return Object.assign({}, sectionState, {
+            data: normalizeSectionData(sectionState.data)
+          })
+        } else {
+          return sectionState;
+        }
+      }),
+      distinctUntilChanged()
+      );
   }
 
   /**
@@ -311,8 +350,10 @@ export class SectionsService {
    *    The section data
    * @param errors
    *    The list of section errors
+   * @param metadata
+   *    The section metadata
    */
-  public updateSectionData(submissionId: string, sectionId: string, data: WorkspaceitemSectionDataType, errors: SubmissionSectionError[] = []) {
+  public updateSectionData(submissionId: string, sectionId: string, data: WorkspaceitemSectionDataType, errors: SubmissionSectionError[] = [], metadata?: string[]) {
     if (isNotEmpty(data)) {
       const isAvailable$ = this.isSectionAvailable(submissionId, sectionId);
       const isEnabled$ = this.isSectionEnabled(submissionId, sectionId);
@@ -321,11 +362,7 @@ export class SectionsService {
         take(1),
         filter(([available, enabled]: [boolean, boolean]) => available))
         .subscribe(([available, enabled]: [boolean, boolean]) => {
-          if (!enabled) {
-            const msg = this.translate.instant('submission.sections.general.metadata-extracted-new-section', {sectionId});
-            this.notificationsService.info(null, msg, null, true);
-          }
-          this.store.dispatch(new UpdateSectionDataAction(submissionId, sectionId, data, errors));
+          this.store.dispatch(new UpdateSectionDataAction(submissionId, sectionId, data, errors, metadata));
         });
     }
   }
@@ -357,4 +394,30 @@ export class SectionsService {
   public setSectionStatus(submissionId: string, sectionId: string, status: boolean) {
     this.store.dispatch(new SectionStatusChangeAction(submissionId, sectionId, status));
   }
+
+  /**
+   * Compute the list of selectable metadata for the section configuration.
+   * @param formConfig
+   */
+  public computeSectionConfiguredMetadata(formConfig: string | SubmissionFormsModel): string[] {
+    const metadata = [];
+    const rawData = typeof formConfig === 'string' ? JSON.parse(formConfig, parseReviver) : formConfig;
+    if (rawData.rows && !isEmpty(rawData.rows)) {
+      rawData.rows.forEach((currentRow) => {
+        if (currentRow.fields && !isEmpty(currentRow.fields)) {
+          currentRow.fields.forEach((field) => {
+            if (field.selectableMetadata && !isEmpty(field.selectableMetadata)) {
+              field.selectableMetadata.forEach((selectableMetadata) => {
+                if (!metadata.includes(selectableMetadata.metadata)) {
+                  metadata.push(selectableMetadata.metadata);
+                }
+              })
+            }
+          })
+        }
+      });
+    }
+    return metadata;
+  }
+
 }
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
index 04852cc0144..07318807b68 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { find } from 'rxjs/operators';
 
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { ResourcePolicy } from '../../../../core/shared/resource-policy.model';
+import { ResourcePolicy } from '../../../../core/resource-policy/models/resource-policy.model';
 import { isEmpty } from '../../../../shared/empty.util';
 import { Group } from '../../../../core/eperson/models/group.model';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -42,7 +42,7 @@ export class SubmissionSectionUploadAccessConditionsComponent implements OnInit
   ngOnInit() {
     this.accessConditions.forEach((accessCondition: ResourcePolicy) => {
       if (isEmpty(accessCondition.name)) {
-        this.groupService.findById(accessCondition.groupUUID).pipe(
+        this.groupService.findByHref(accessCondition._links.group.href).pipe(
           find((rd: RemoteData<Group>) => !rd.isResponsePending && rd.hasSucceeded))
           .subscribe((rd: RemoteData<Group>) => {
             const group: Group = rd.payload;
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index 1e51add4643..5fb49b2e218 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -21,6 +21,7 @@ import {
   mockSubmissionCollectionId,
   mockSubmissionId,
   mockUploadConfigResponse,
+  mockUploadConfigResponseMetadata,
   mockUploadFiles
 } from '../../../../../shared/mocks/submission.mock';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -47,7 +48,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
     [mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]],
   ]);
   const collectionPolicyType = POLICY_DEFAULT_WITH_LIST;
-  const configMetadataForm: any = mockUploadConfigResponse.metadata;
+  const configMetadataForm: any = mockUploadConfigResponseMetadata;
   const fileIndex = '0';
   const fileId = '123456-test-upload';
   const fileData: any = mockUploadFiles[0];
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index d63bc1b7d60..f07c524b8a0 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -36,7 +36,7 @@ <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.n
                                        [fileId]="fileIndexes[fileList.indexOf(fileEntry)]"
                                        [fileIndex]="fileList.indexOf(fileEntry)"
                                        [fileName]="fileNames[fileList.indexOf(fileEntry)]"
-                                       [sectionId]="'upload'"
+                                       [sectionId]="sectionData.id"
                                        [submissionId]="submissionId"></ds-submission-upload-section-file>
     <div class="row">
       <div class="col-md-12">
diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
index 3024e68d8c8..7114ecea919 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -1,7 +1,10 @@
 import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { CommonModule } from '@angular/common';
 
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -20,30 +23,28 @@ import {
   mockSubmissionId,
   mockSubmissionState,
   mockUploadConfigResponse,
-  mockUploadConfigResponseNotRequired, mockUploadFiles,
+  mockUploadConfigResponseNotRequired,
+  mockUploadFiles,
 } from '../../../shared/mocks/submission.mock';
-import { BrowserModule } from '@angular/platform-browser';
-import { CommonModule } from '@angular/common';
 import { SubmissionUploadsConfigService } from '../../../core/config/submission-uploads-config.service';
 import { SectionUploadService } from './section-upload.service';
 import { SubmissionSectionUploadComponent } from './section-upload.component';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { cold, hot } from 'jasmine-marbles';
 import { Collection } from '../../../core/shared/collection.model';
-import { ResourcePolicy } from '../../../core/shared/resource-policy.model';
-import { ResourcePolicyService } from '../../../core/data/resource-policy.service';
-import { ConfigData } from '../../../core/config/config-data';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
 import { Group } from '../../../core/eperson/models/group.model';
 import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
+import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
 
 function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigService {
   return jasmine.createSpyObj('SubmissionUploadsConfigService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
     getConfigByName: jasmine.createSpy('getConfigByName'),
-    getConfigBySearch: jasmine.createSpy('getConfigBySearch')
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
+    findByHref: jasmine.createSpy('findByHref')
   });
 }
 
@@ -96,7 +97,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       },
       errors: [],
       header: 'submit.progressbar.describe.upload',
-      id: 'upload',
+      id: 'upload-id',
       sectionType: SectionsType.Upload
     };
     submissionId = mockSubmissionId;
@@ -204,9 +205,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
 
-      uploadsConfigService.getConfigByHref.and.returnValue(observableOf(
-        new ConfigData(new PageInfo(), mockUploadConfigResponse as any)
-      ));
+      uploadsConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new SubmissionUploadsModel(), mockUploadConfigResponse)));
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
@@ -244,9 +243,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
 
-      uploadsConfigService.getConfigByHref.and.returnValue(observableOf(
-        new ConfigData(new PageInfo(), mockUploadConfigResponse as any)
-      ));
+      uploadsConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new SubmissionUploadsModel(), mockUploadConfigResponse)));
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
@@ -283,9 +280,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
 
-      uploadsConfigService.getConfigByHref.and.returnValue(observableOf(
-        new ConfigData(new PageInfo(), mockUploadConfigResponse as any)
-      ));
+      uploadsConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new SubmissionUploadsModel(), mockUploadConfigResponse)));
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
@@ -314,9 +309,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
 
-      uploadsConfigService.getConfigByHref.and.returnValue(observableOf(
-        new ConfigData(new PageInfo(), mockUploadConfigResponseNotRequired as any)
-      ));
+      uploadsConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new SubmissionUploadsModel(), mockUploadConfigResponseNotRequired)));
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 482965b6b44..6814bae8b4c 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -1,14 +1,28 @@
 import { ChangeDetectorRef, Component, Inject } from '@angular/core';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription} from 'rxjs';
-import { distinctUntilChanged, filter, find, flatMap, map, reduce, take, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  flatMap,
+  map,
+  reduce,
+  tap,
+  switchMap
+} from 'rxjs/operators';
 
 import { SectionModelComponent } from '../models/section.model';
 import { hasValue, isNotEmpty, isNotUndefined, isUndefined } from '../../../shared/empty.util';
 import { SectionUploadService } from './section-upload.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { ResourcePolicyService } from '../../../core/data/resource-policy.service';
+import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
 import { SubmissionUploadsConfigService } from '../../../core/config/submission-uploads-config.service';
 import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
@@ -23,7 +37,9 @@ import { SectionsService } from '../sections.service';
 import { SubmissionService } from '../../submission.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { AccessConditionOption } from '../../../core/config/models/config-access-condition-option.model';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 
 export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
 export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
@@ -146,13 +162,18 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
    * Initialize all instance variables and retrieve collection default access conditions
    */
   onSectionInit() {
-    const config$ = this.uploadsConfigService.getConfigByHref(this.sectionData.config).pipe(
+    const config$ = this.uploadsConfigService.findByHref(this.sectionData.config, false, followLink('metadata')).pipe(
+      getFirstSucceededRemoteData(),
       map((config) => config.payload));
 
     // retrieve configuration for the bitstream's metadata form
     this.configMetadataForm$ = config$.pipe(
-      take(1),
-      map((config: SubmissionUploadsModel) => config.metadata));
+      switchMap((config: SubmissionUploadsModel) =>
+        config.metadata.pipe(
+          getFirstSucceededRemoteData(),
+          map((remoteData: RemoteData<SubmissionFormsModel>) => remoteData.payload)
+        )
+      ));
 
     this.subs.push(
       this.submissionService.getSubmissionObject(this.submissionId).pipe(
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 806258baa82..d92f0758f0c 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -28,7 +28,11 @@ import { SubmissionSectionUploadFileViewComponent } from './sections/upload/file
 import { SubmissionSectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
 import { SubmissionSubmitComponent } from './submit/submission-submit.component';
 import { storeModuleConfig } from '../app.reducer';
-import { CoreState } from '../core/core.reducers';
+import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
+import { SubmissionImportExternalSearchbarComponent } from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
+import { SubmissionImportExternalPreviewComponent } from './import-external/import-external-preview/submission-import-external-preview.component';
+import { SubmissionImportExternalCollectionComponent } from './import-external/import-external-collection/submission-import-external-collection.component';
+import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
 
 @NgModule({
   imports: [
@@ -44,8 +48,8 @@ import { CoreState } from '../core/core.reducers';
     SubmissionSectionUploadComponent,
     SubmissionSectionformComponent,
     SubmissionSectionLicenseComponent,
+    SubmissionSectionCcLicensesComponent,
     SectionsDirective,
-    SubmissionSectionContainerComponent,
     SubmissionEditComponent,
     SubmissionFormSectionAddComponent,
     SubmissionFormCollectionComponent,
@@ -53,19 +57,29 @@ import { CoreState } from '../core/core.reducers';
     SubmissionFormFooterComponent,
     SubmissionSubmitComponent,
     SubmissionUploadFilesComponent,
+    SubmissionSectionContainerComponent,
     SubmissionSectionUploadFileComponent,
     SubmissionSectionUploadFileEditComponent,
-    SubmissionSectionUploadFileViewComponent
+    SubmissionSectionUploadFileViewComponent,
+    SubmissionImportExternalComponent,
+    SubmissionImportExternalSearchbarComponent,
+    SubmissionImportExternalPreviewComponent,
+    SubmissionImportExternalCollectionComponent
   ],
   entryComponents: [
     SubmissionSectionUploadComponent,
     SubmissionSectionformComponent,
     SubmissionSectionLicenseComponent,
-    SubmissionSectionContainerComponent],
+    SubmissionSectionContainerComponent,
+    SubmissionImportExternalPreviewComponent,
+    SubmissionImportExternalCollectionComponent,
+    SubmissionSectionCcLicensesComponent
+  ],
   exports: [
     SubmissionEditComponent,
     SubmissionFormComponent,
-    SubmissionSubmitComponent
+    SubmissionSubmitComponent,
+    SubmissionImportExternalComponent
   ],
   providers: [
     SectionUploadService,
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index eb7538ec695..579d1c0624c 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -15,7 +15,7 @@ import { SubmissionRestService } from '../core/submission/submission-rest.servic
 import { RouteService } from '../core/services/route.service';
 import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
 import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
-import { HttpOptions } from '../core/dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
 import { SubmissionScopeType } from '../core/submission/submission-scope-type';
 import {
   mockSubmissionDefinition,
@@ -35,18 +35,19 @@ import {
   SaveSubmissionSectionFormAction,
   SetActiveSectionAction
 } from './objects/submission-objects.actions';
-import { RemoteDataError } from '../core/data/remote-data-error';
 import { throwError as observableThrowError } from 'rxjs/internal/observable/throwError';
 import {
   createFailedRemoteDataObject,
-  createSuccessfulRemoteDataObject,
 } from '../shared/remote-data.utils';
 import { getMockSearchService } from '../shared/mocks/search-service.mock';
 import { getMockRequestService } from '../shared/mocks/request.service.mock';
 import { RequestService } from '../core/data/request.service';
 import { SearchService } from '../core/shared/search/search.service';
+import { Item } from '../core/shared/item.model';
 import { storeModuleConfig } from '../app.reducer';
 import { environment } from '../../environments/environment';
+import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
+import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
 
 describe('SubmissionService test suite', () => {
   const collectionId = '43fe1f8c-09a6-4fcf-9c78-5d4fed8f2c8f';
@@ -346,6 +347,7 @@ describe('SubmissionService test suite', () => {
   const router = new RouterMock();
   const selfUrl = 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826';
   const submissionDefinition: any = mockSubmissionDefinition;
+  const submissionJsonPatchOperationsService = new SubmissionJsonPatchOperationsServiceStub();
 
   let scheduler: TestScheduler;
   let service: SubmissionService;
@@ -372,6 +374,7 @@ describe('SubmissionService test suite', () => {
         { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestServce },
+        { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsService },
         NotificationsService,
         RouteService,
         SubmissionService,
@@ -410,6 +413,19 @@ describe('SubmissionService test suite', () => {
     });
   });
 
+  describe('createSubmissionFromExternalSource', () => {
+    it('should deposit submission', () => {
+      const options: HttpOptions = Object.create({});
+      let headers = new HttpHeaders();
+      headers = headers.append('Content-Type', 'text/uri-list');
+      options.headers = headers;
+
+      service.createSubmissionFromExternalSource(selfUrl, collectionId);
+
+      expect((service as any).restService.postToEndpoint).toHaveBeenCalledWith('workspaceitems', selfUrl, null, options, collectionId);
+    });
+  });
+
   describe('depositSubmission', () => {
     it('should deposit submission', () => {
       const options: HttpOptions = Object.create({});
@@ -439,6 +455,7 @@ describe('SubmissionService test suite', () => {
         selfUrl,
         submissionDefinition,
         {},
+        new Item(),
         []
       );
       const expected = new InitSubmissionFormAction(
@@ -447,6 +464,7 @@ describe('SubmissionService test suite', () => {
         selfUrl,
         submissionDefinition,
         {},
+        new Item(),
         []);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -473,11 +491,18 @@ describe('SubmissionService test suite', () => {
 
   describe('dispatchSave', () => {
     it('should dispatch a new SaveSubmissionFormAction', () => {
-      service.dispatchSave(submissionId,);
+      service.dispatchSave(submissionId);
       const expected = new SaveSubmissionFormAction(submissionId);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
     });
+
+    it('should dispatch a new SaveSubmissionFormAction with manual flag', () => {
+      service.dispatchSave(submissionId, true);
+      const expected = new SaveSubmissionFormAction(submissionId, true);
+
+      expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
+    });
   });
 
   describe('dispatchSaveForLater', () => {
@@ -732,6 +757,20 @@ describe('SubmissionService test suite', () => {
     });
   });
 
+  describe('hasUnsavedModification', () => {
+    it('should call jsonPatchOperationService hasPendingOperation observable', () => {
+      (service as any).jsonPatchOperationService.hasPendingOperations = jasmine.createSpy('hasPendingOperations')
+        .and.returnValue(observableOf(true));
+
+      scheduler = getTestScheduler();
+      scheduler.schedule(() => service.hasUnsavedModification());
+      scheduler.flush();
+
+      expect((service as any).jsonPatchOperationService.hasPendingOperations).toHaveBeenCalledWith('sections');
+
+    });
+  });
+
   describe('isSectionHidden', () => {
     it('should return true/false when section is hidden/visible', () => {
       let section: any = {
@@ -842,14 +881,17 @@ describe('SubmissionService test suite', () => {
         submissionId,
         selfUrl,
         submissionDefinition,
-        {}
-      );
+        {},
+        new Item()
+      )
+      ;
       const expected = new ResetSubmissionFormAction(
         collectionId,
         submissionId,
         selfUrl,
         {},
-        submissionDefinition
+        submissionDefinition,
+        new Item()
       );
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -864,8 +906,7 @@ describe('SubmissionService test suite', () => {
 
       const result = service.retrieveSubmission('826');
       const expected = cold('(b|)', {
-        b: createSuccessfulRemoteDataObject(
-          mockSubmissionRestResponse[0])
+        b: jasmine.objectContaining({ payload: mockSubmissionRestResponse[0] })
       });
 
       expect(result).toBeObservable(expected);
@@ -875,15 +916,16 @@ describe('SubmissionService test suite', () => {
       (service as any).restService.getDataById.and.callFake(
         () => observableThrowError({
           statusCode: 500,
-          statusText: 'Internal Server Error',
-          errorMessage: 'Error message'
+          errorMessage: 'Internal Server Error',
         })
       );
 
       service.retrieveSubmission('826').subscribe((r) => {
-        expect(r).toEqual(createFailedRemoteDataObject(null,
-          new RemoteDataError(500, 'Internal Server Error', 'Error message')
-        ))
+        const expectedRD = createFailedRemoteDataObject('Internal Server Error',500) as any;
+        expect(r.payload).toEqual(expectedRD.payload);
+        expect(r.statusCode).toEqual(expectedRD.statusCode);
+        expect(r.errorMessage).toEqual(expectedRD.errorMessage);
+        expect(r.hasSucceeded).toEqual(expectedRD.hasSucceeded);
       });
     });
   });
@@ -898,8 +940,15 @@ describe('SubmissionService test suite', () => {
   });
 
   describe('startAutoSave', () => {
+
+    let environmentAutoSaveTimerOriginalValue;
+
+    beforeEach(() => {
+      environmentAutoSaveTimerOriginalValue = environment.submission.autosave.timer;
+    });
+
     it('should start Auto Save', fakeAsync(() => {
-      const duration = environment.submission.autosave.timer * (1000 * 60);
+      const duration = environment.submission.autosave.timer;
 
       service.startAutoSave('826');
       const sub = (service as any).timer$.subscribe();
@@ -913,6 +962,19 @@ describe('SubmissionService test suite', () => {
       sub.unsubscribe();
       (service as any).autoSaveSub.unsubscribe();
     }));
+
+    it('should not start Auto Save if timer is 0', fakeAsync(() => {
+      environment.submission.autosave.timer = 0;
+
+      service.startAutoSave('826');
+
+      expect((service as any).autoSaveSub).toBeUndefined();
+    }));
+
+    afterEach(() => {
+      environment.submission.autosave.timer = environmentAutoSaveTimerOriginalValue;
+    })
+
   });
 
   describe('stopAutoSave', () => {
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index f06f6ea0693..87d6cbc9a44 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
 import { Router } from '@angular/router';
 
@@ -28,8 +28,7 @@ import {
   SubmissionSectionObject
 } from './objects/submission-objects.reducer';
 import { submissionObjectFromIdSelector } from './selectors';
-import { GlobalConfig } from '../../config/global-config.interface';
-import { HttpOptions } from '../core/dspace-rest-v2/dspace-rest-v2.service';
+import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
 import { SubmissionRestService } from '../core/submission/submission-rest.service';
 import { SectionDataObject } from './sections/models/section-data.model';
 import { SubmissionScopeType } from '../core/submission/submission-scope-type';
@@ -41,11 +40,12 @@ import { SubmissionDefinitionsModel } from '../core/config/models/config-submiss
 import { WorkspaceitemSectionsObject } from '../core/submission/models/workspaceitem-sections.model';
 import { RemoteData } from '../core/data/remote-data';
 import { ErrorResponse } from '../core/cache/response.models';
-import { RemoteDataError } from '../core/data/remote-data-error';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
 import { RequestService } from '../core/data/request.service';
 import { SearchService } from '../core/shared/search/search.service';
+import { Item } from '../core/shared/item.model';
 import { environment } from '../../environments/environment';
+import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
 
 /**
  * A service that provides methods used in submission process.
@@ -67,7 +67,6 @@ export class SubmissionService {
   private workflowLinkPath = 'workflowitems';
   /**
    * Initialize service variables
-   * @param {GlobalConfig} EnvConfig
    * @param {NotificationsService} notificationsService
    * @param {SubmissionRestService} restService
    * @param {Router} router
@@ -84,7 +83,8 @@ export class SubmissionService {
               protected store: Store<SubmissionState>,
               protected translate: TranslateService,
               protected searchService: SearchService,
-              protected requestService: RequestService) {
+              protected requestService: RequestService,
+              protected jsonPatchOperationService: SubmissionJsonPatchOperationsService) {
   }
 
   /**
@@ -113,6 +113,24 @@ export class SubmissionService {
       catchError(() => observableOf({} as SubmissionObject)))
   }
 
+  /**
+   * Perform a REST call to deposit a workspaceitem and return response
+   *
+   * @param selfUrl
+   *    The workspaceitem self url
+   * @param collectionId
+   *    Optional collection id
+   * @return Observable<SubmissionObject>
+   *    observable of SubmissionObject
+   */
+  createSubmissionFromExternalSource(selfUrl: string, collectionId?: string): Observable<SubmissionObject[]> {
+    const options: HttpOptions = Object.create({});
+    let headers = new HttpHeaders();
+    headers = headers.append('Content-Type', 'text/uri-list');
+    options.headers = headers;
+    return this.restService.postToEndpoint(this.workspaceLinkPath, selfUrl, null, options, collectionId) as Observable<SubmissionObject[]>;
+  }
+
   /**
    * Perform a REST call to deposit a workspaceitem and return response
    *
@@ -163,8 +181,9 @@ export class SubmissionService {
     selfUrl: string,
     submissionDefinition: SubmissionDefinitionsModel,
     sections: WorkspaceitemSectionsObject,
+    item: Item,
     errors: SubmissionSectionError[]) {
-    this.store.dispatch(new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, sections, errors));
+    this.store.dispatch(new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, sections, item, errors));
   }
 
   /**
@@ -192,12 +211,14 @@ export class SubmissionService {
    *
    * @param submissionId
    *    The submission id
+   * @param manual
+   *    whether is a manual save, default false
    */
-  dispatchSave(submissionId) {
+  dispatchSave(submissionId, manual?: boolean) {
     this.getSubmissionSaveProcessingStatus(submissionId).pipe(
       find((isPending: boolean) => !isPending)
     ).subscribe(() => {
-      this.store.dispatch(new SaveSubmissionFormAction(submissionId));
+      this.store.dispatch(new SaveSubmissionFormAction(submissionId, manual));
     })
   }
 
@@ -410,6 +431,16 @@ export class SubmissionService {
       startWith(false));
   }
 
+  /**
+   * Return whether submission unsaved modification are present
+   *
+   * @return Observable<boolean>
+   *    observable with submission unsaved modification presence
+   */
+  hasUnsavedModification(): Observable<boolean> {
+    return this.jsonPatchOperationService.hasPendingOperations('sections');
+  }
+
   /**
    * Return the visibility status of the specified section
    *
@@ -502,9 +533,10 @@ export class SubmissionService {
     submissionId: string,
     selfUrl: string,
     submissionDefinition: SubmissionDefinitionsModel,
-    sections: WorkspaceitemSectionsObject
+    sections: WorkspaceitemSectionsObject,
+    item: Item
   ) {
-    this.store.dispatch(new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, sections, submissionDefinition));
+    this.store.dispatch(new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, sections, submissionDefinition, item));
   }
 
   /**
@@ -519,9 +551,7 @@ export class SubmissionService {
       map((submissionObjects: SubmissionObject[]) => createSuccessfulRemoteDataObject(
         submissionObjects[0])),
       catchError((errorResponse: ErrorResponse) => {
-        return createFailedRemoteDataObject$(null,
-          new RemoteDataError(errorResponse.statusCode, errorResponse.statusText, errorResponse.errorMessage)
-        )
+        return createFailedRemoteDataObject$<SubmissionObject>(errorResponse.errorMessage, errorResponse.statusCode)
       })
     );
   }
@@ -546,9 +576,12 @@ export class SubmissionService {
    */
   startAutoSave(submissionId) {
     this.stopAutoSave();
+    if (environment.submission.autosave.timer === 0) {
+      return;
+    }
+
     // AUTOSAVE submission
-    // Retrieve interval from config and convert to milliseconds
-    const duration = environment.submission.autosave.timer * (1000 * 60);
+    const duration = environment.submission.autosave.timer;
     // Dispatch save action after given duration
     this.timer$ = observableTimer(duration, duration);
     this.autoSaveSub = this.timer$
diff --git a/src/app/submission/submit/submission-submit.component.html b/src/app/submission/submit/submission-submit.component.html
index c9e8c6b51ad..a7680f07c25 100644
--- a/src/app/submission/submit/submission-submit.component.html
+++ b/src/app/submission/submit/submission-submit.component.html
@@ -1,8 +1,10 @@
 <div class="submission-submit-container">
   <div class="submission-submit-container">
     <ds-submission-form [collectionId]="collectionId"
+                        [sections]="sections"
                         [selfUrl]="selfUrl"
                         [submissionDefinition]="submissionDefinition"
+                        [item]="item"
                         [submissionId]="submissionId"></ds-submission-form>
   </div>
 </div>
diff --git a/src/app/submission/submit/submission-submit.component.spec.ts b/src/app/submission/submit/submission-submit.component.spec.ts
index d0a2291ba99..19cd6d55dde 100644
--- a/src/app/submission/submit/submission-submit.component.spec.ts
+++ b/src/app/submission/submit/submission-submit.component.spec.ts
@@ -69,6 +69,7 @@ describe('SubmissionSubmitComponent Component', () => {
     expect(comp.submissionId.toString()).toEqual(submissionId);
     expect(comp.collectionId).toBe(submissionObject.collection.id);
     expect(comp.selfUrl).toBe(submissionObject._links.self.href);
+    expect(comp.sections).toBe(submissionObject.sections);
     expect(comp.submissionDefinition).toBe(submissionObject.submissionDefinition);
 
   }));
diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts
index d3d3ca4e66e..3c7e0ce6a7d 100644
--- a/src/app/submission/submit/submission-submit.component.ts
+++ b/src/app/submission/submit/submission-submit.component.ts
@@ -10,6 +10,8 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { SubmissionService } from '../submission.service';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { Collection } from '../../core/shared/collection.model';
+import { Item } from '../../core/shared/item.model';
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
 
 /**
  * This component allows to submit a new workspaceitem.
@@ -26,6 +28,7 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
    * @type {string}
    */
   public collectionId: string;
+  public item: Item;
 
   /**
    * The collection id input to create a new submission
@@ -33,6 +36,12 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
    */
   public collectionParam: string;
 
+  /**
+   * The list of submission's sections
+   * @type {WorkspaceitemSectionsObject}
+   */
+  public sections: WorkspaceitemSectionsObject;
+
   /**
    * The submission self url
    * @type {string}
@@ -95,9 +104,11 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
               this.router.navigate(['/mydspace']);
             } else {
               this.collectionId = (submissionObject.collection as Collection).id;
+              this.sections = submissionObject.sections;
               this.selfUrl = submissionObject._links.self.href;
               this.submissionDefinition = (submissionObject.submissionDefinition as SubmissionDefinitionsModel);
               this.submissionId = submissionObject.id;
+              this.item = submissionObject.item as Item;
               this.changeDetectorRef.detectChanges();
             }
           }
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index d7afa97f085..a2a7042d335 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -4210,9 +4210,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -4322,9 +4322,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -4402,9 +4402,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 6a41ef7a054..775189bdf85 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4078,9 +4078,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -4190,9 +4190,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -4270,9 +4270,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 56398af5376..b68e3d583a3 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -3437,8 +3437,8 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Von LC Name importieren",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Von ORCID importieren",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Von ORCID importieren",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Von Sherpa Zeitschriften importieren",
@@ -3521,8 +3521,8 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Verlage ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Namen ({{ count }})",
@@ -3581,8 +3581,8 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Suchergebnisse",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Suchergebnisse",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Suchergebnisse",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Suchergebnisse",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 03dc00bd819..603acb3f48a 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1,12 +1,36 @@
 {
 
+  "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
+
+  "401.link.home-page": "Take me to the home page",
+
+  "401.unauthorized": "unauthorized",
+
+
+
+  "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
+
+  "403.link.home-page": "Take me to the home page",
+
+  "403.forbidden": "forbidden",
+
+
+
   "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
 
   "404.link.home-page": "Take me to the home page",
 
   "404.page-not-found": "page not found",
 
+  "admin.curation-tasks.breadcrumbs": "System curation tasks",
+
+  "admin.curation-tasks.title": "System curation tasks",
+
+  "admin.curation-tasks.header": "System curation tasks",
 
+  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
 
   "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
 
@@ -30,6 +54,8 @@
 
   "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
 
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+
   "admin.registries.bitstream-formats.edit.description.hint": "",
 
   "admin.registries.bitstream-formats.edit.description.label": "Description",
@@ -94,6 +120,8 @@
 
 
 
+  "admin.registries.metadata.breadcrumbs": "Metadata registry",
+
   "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
 
   "admin.registries.metadata.form.create": "Create metadata schema",
@@ -120,6 +148,8 @@
 
 
 
+  "admin.registries.schema.breadcrumbs": "Metadata schema",
+
   "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
 
   "admin.registries.schema.fields.head": "Schema metadata fields",
@@ -236,6 +266,10 @@
 
   "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
 
+  "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+
+  "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
 
   "admin.access-control.epeople.form.table.id": "ID",
@@ -254,6 +288,10 @@
 
   "admin.access-control.groups.title": "DSpace Angular :: Groups",
 
+  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+
+  "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+
   "admin.access-control.groups.head": "Groups",
 
   "admin.access-control.groups.button.add": "Add group",
@@ -282,8 +320,15 @@
 
   "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
 
-  "admin.access-control.groups.notification.deleted.failure": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+
+  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
+
+
 
+  "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
+
+  "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
 
   "admin.access-control.groups.form.head.create": "Create group",
 
@@ -299,6 +344,28 @@
 
   "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
 
+  "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+
+  "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+
+  "admin.access-control.groups.form.actions.delete": "Delete Group",
+
+  "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+
+  "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
+
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+
+  "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+
   "admin.access-control.groups.form.members-list.head": "EPeople",
 
   "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
@@ -395,14 +462,10 @@
 
   "admin.search.item.move": "Move",
 
-  "admin.search.item.private": "Private",
-
   "admin.search.item.reinstate": "Reinstate",
 
   "admin.search.item.withdraw": "Withdraw",
 
-  "admin.search.item.withdrawn": "Withdrawn",
-
   "admin.search.title": "Administrative Search",
 
 
@@ -420,6 +483,26 @@
 
 
 
+  "admin.metadata-import.breadcrumbs": "Import Metadata",
+
+  "admin.metadata-import.title": "Import Metadata",
+
+  "admin.metadata-import.page.header": "Import Metadata",
+
+  "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
+
+  "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+
+  "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+
+  "admin.metadata-import.page.button.return": "Return",
+
+  "admin.metadata-import.page.button.proceed": "Proceed",
+
+  "admin.metadata-import.page.error.addFile": "Select file first!",
+
+
+
 
   "auth.errors.invalid-user": "Invalid email address or password.",
 
@@ -542,6 +625,8 @@
 
   "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
 
+  "collection.curate.header": "Curate Collection: {{collection}}",
+
   "collection.delete.cancel": "Cancel",
 
   "collection.delete.confirm": "Confirm",
@@ -626,6 +711,10 @@
 
   "collection.edit.tabs.curate.title": "Collection Edit - Curate",
 
+  "collection.edit.tabs.authorizations.head": "Authorizations",
+
+  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+
   "collection.edit.tabs.metadata.head": "Edit Metadata",
 
   "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
@@ -672,6 +761,28 @@
 
 
 
+  "collection.edit.template.add-button": "Add",
+
+  "collection.edit.template.breadcrumbs": "Item template",
+
+  "collection.edit.template.cancel": "Cancel",
+
+  "collection.edit.template.delete-button": "Delete",
+
+  "collection.edit.template.edit-button": "Edit",
+
+  "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+
+  "collection.edit.template.label": "Template item",
+
+  "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+
+  "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+
+  "collection.edit.template.title": "Edit Template Item",
+
+
+
   "collection.form.abstract": "Short Description",
 
   "collection.form.description": "Introductory text (HTML)",
@@ -690,10 +801,16 @@
 
 
 
+  "collection.listelement.badge": "Collection",
+
+
+
   "collection.page.browse.recent.head": "Recent Submissions",
 
   "collection.page.browse.recent.empty": "No items to show",
 
+  "collection.page.edit": "Edit this collection",
+
   "collection.page.handle": "Permanent URI for this collection",
 
   "collection.page.license": "License",
@@ -730,6 +847,8 @@
 
   "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
 
+  "community.curate.header": "Curate Community: {{community}}",
+
   "community.delete.cancel": "Cancel",
 
   "community.delete.confirm": "Confirm",
@@ -767,6 +886,10 @@
 
   "community.edit.notifications.success": "Successfully edited the Community",
 
+  "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+
+  "community.edit.notifications.error": "An error occured while editing the Community",
+
   "community.edit.return": "Return",
 
 
@@ -783,6 +906,14 @@
 
   "community.edit.tabs.roles.title": "Community Edit - Roles",
 
+  "community.edit.tabs.authorizations.head": "Authorizations",
+
+  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+
+
+
+  "community.listelement.badge": "Community",
+
 
 
   "comcol-role.edit.no-group": "None",
@@ -851,6 +982,8 @@
 
   "community.form.title": "Name",
 
+  "community.page.edit": "Edit this community",
+
   "community.page.handle": "Permanent URI for this community",
 
   "community.page.license": "License",
@@ -865,8 +998,104 @@
 
 
 
+  "cookies.consent.accept-all": "Accept all",
+
+  "cookies.consent.accept-selected": "Accept selected",
+
+  "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+
+  "cookies.consent.app.opt-out.title": "(opt-out)",
+
+  "cookies.consent.app.purpose": "purpose",
+
+  "cookies.consent.app.required.description": "This application is always required",
+
+  "cookies.consent.app.required.title": "(always required)",
+
+  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+
+  "cookies.consent.close": "Close",
+
+  "cookies.consent.decline": "Decline",
+
+  "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
+
+  "cookies.consent.content-notice.learnMore": "Customize",
+
+  "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+
+  "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+
+  "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+
+  "cookies.consent.content-modal.title": "Information that we collect",
+
+
+
+  "cookies.consent.app.title.authentication": "Authentication",
+
+  "cookies.consent.app.description.authentication": "Required for signing you in",
+
+
+  "cookies.consent.app.title.preferences": "Preferences",
+
+  "cookies.consent.app.description.preferences": "Required for saving your preferences",
+
+
+
+  "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+
+  "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+
+
+
+  "cookies.consent.app.title.google-analytics": "Google Analytics",
+
+  "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+
+
+
+  "cookies.consent.purpose.functional": "Functional",
+
+  "cookies.consent.purpose.statistical": "Statistical",
+
+
+  "curation-task.task.checklinks.label":  "Check Links in Metadata",
+
+  "curation-task.task.noop.label": "NOOP",
+
+  "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+
+  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+
+  "curation-task.task.translate.label": "Microsoft Translator",
+
+  "curation-task.task.vscan.label": "Virus Scan",
+
+
+
+  "curation.form.task-select.label": "Task:",
+
+  "curation.form.submit": "Start",
+
+  "curation.form.submit.success.head": "The curation task has been started successfully",
+
+  "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+
+  "curation.form.submit.error.head": "Running the curation task failed",
+
+  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+
+  "curation.form.handle.label": "Handle:",
+
+  "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+
+
+
   "dso-selector.create.collection.head": "New collection",
 
+  "dso-selector.create.collection.sub-level": "Create a new collection in",
+
   "dso-selector.create.community.head": "New community",
 
   "dso-selector.create.community.sub-level": "Create a new community in",
@@ -875,18 +1104,41 @@
 
   "dso-selector.create.item.head": "New item",
 
+  "dso-selector.create.item.sub-level": "Create a new item in",
+
+  "dso-selector.create.submission.head": "New submission",
+
   "dso-selector.edit.collection.head": "Edit collection",
 
   "dso-selector.edit.community.head": "Edit community",
 
   "dso-selector.edit.item.head": "Edit item",
 
+  "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+
   "dso-selector.no-results": "No {{ type }} found",
 
   "dso-selector.placeholder": "Search for a {{ type }}",
 
 
 
+  "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+
+  "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+
+  "confirmation-modal.export-metadata.cancel": "Cancel",
+
+  "confirmation-modal.export-metadata.confirm": "Export",
+
+  "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+
+  "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+
+  "confirmation-modal.delete-eperson.cancel": "Cancel",
+
+  "confirmation-modal.delete-eperson.confirm": "Delete",
+
+
   "error.bitstream": "Error fetching bitstream",
 
   "error.browse-by": "Error fetching items",
@@ -927,12 +1179,79 @@
 
 
 
+  "file-section.error.header": "Error obtaining files for this item",
+
+
+
   "footer.copyright": "copyright © 2002-{{ year }}",
 
   "footer.link.dspace": "DSpace software",
 
   "footer.link.duraspace": "DuraSpace",
 
+  "footer.link.cookies": "Cookie settings",
+
+  "footer.link.privacy-policy": "Privacy policy",
+
+  "footer.link.end-user-agreement":"End User Agreement",
+
+
+
+  "forgot-email.form.header": "Forgot Password",
+
+  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+
+  "forgot-email.form.email": "Email Address *",
+
+  "forgot-email.form.email.error.required": "Please fill in an email address",
+
+  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+
+  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+
+  "forgot-email.form.submit": "Submit",
+
+  "forgot-email.form.success.head": "Verification email sent",
+
+  "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+
+  "forgot-email.form.error.head": "Error when trying to register email",
+
+  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+
+
+
+  "forgot-password.title": "Forgot Password",
+
+  "forgot-password.form.head": "Forgot Password",
+
+  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+
+  "forgot-password.form.card.security": "Security",
+
+  "forgot-password.form.identification.header": "Identify",
+
+  "forgot-password.form.identification.email": "Email address: ",
+
+  "forgot-password.form.label.password": "Password",
+
+  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+
+  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+
+  "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+
+  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+
+  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+
+  "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
+
+  "forgot-password.form.notification.success.title": "Password reset completed",
+
+  "forgot-password.form.submit": "Submit password",
+
+
 
   "form.add": "Add",
 
@@ -988,6 +1307,8 @@
 
   "home.description": "",
 
+  "home.breadcrumbs": "Home",
+
   "home.title": "DSpace Angular :: Home",
 
   "home.top-level-communities.head": "Communities in DSpace",
@@ -996,6 +1317,47 @@
 
 
 
+  "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+
+  "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+
+  "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+
+  "info.end-user-agreement.breadcrumbs": "End User Agreement",
+
+  "info.end-user-agreement.buttons.cancel": "Cancel",
+
+  "info.end-user-agreement.buttons.save": "Save",
+
+  "info.end-user-agreement.head": "End User Agreement",
+
+  "info.end-user-agreement.title": "End User Agreement",
+
+  "info.privacy.breadcrumbs": "Privacy Statement",
+
+  "info.privacy.head": "Privacy Statement",
+
+  "info.privacy.title": "Privacy Statement",
+
+
+
+  "item.alerts.private": "This item is private",
+
+  "item.alerts.withdrawn": "This item has been withdrawn",
+
+
+
+  "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
+
+  "item.edit.authorizations.title": "Edit item's Policies",
+
+
+
+  "item.badge.private": "Private",
+
+  "item.badge.withdrawn": "Withdrawn",
+
+
 
   "item.bitstreams.upload.bundle": "Bundle",
 
@@ -1149,6 +1511,8 @@
 
   "item.edit.metadata.edit.buttons.unedit": "Stop editing",
 
+  "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+
   "item.edit.metadata.headers.edit": "Edit",
 
   "item.edit.metadata.headers.field": "Field",
@@ -1163,6 +1527,8 @@
 
   "item.edit.metadata.notifications.discarded.title": "Changed discarded",
 
+  "item.edit.metadata.notifications.error.title": "An error occurred",
+
   "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
 
   "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
@@ -1257,15 +1623,19 @@
 
   "item.edit.relationships.discard-button": "Discard",
 
+  "item.edit.relationships.edit.buttons.add": "Add",
+
   "item.edit.relationships.edit.buttons.remove": "Remove",
 
   "item.edit.relationships.edit.buttons.undo": "Undo changes",
 
+  "item.edit.relationships.no-relationships": "No relationships",
+
   "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
 
   "item.edit.relationships.notifications.discarded.title": "Changes discarded",
 
-  "item.edit.relationships.notifications.failed.title": "Error deleting relationship",
+  "item.edit.relationships.notifications.failed.title": "Error editing relationships",
 
   "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
 
@@ -1279,6 +1649,8 @@
 
   "item.edit.relationships.save-button": "Save",
 
+  "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
+
 
 
   "item.edit.tabs.bitstreams.head": "Bitstreams",
@@ -1369,6 +1741,28 @@
 
 
 
+  "item.listelement.badge": "Item",
+
+  "item.page.description": "Description",
+
+  "item.page.edit": "Edit this item",
+
+  "item.page.journal-issn": "Journal ISSN",
+
+  "item.page.journal-title": "Journal Title",
+
+  "item.page.publisher": "Publisher",
+
+  "item.page.titleprefix": "Item: ",
+
+  "item.page.volume-title": "Volume Title",
+
+  "item.search.results.head": "Item Search Results",
+
+  "item.search.title": "DSpace Angular :: Item Search",
+
+
+
   "item.page.abstract": "Abstract",
 
   "item.page.author": "Authors",
@@ -1379,6 +1773,8 @@
 
   "item.page.date": "Date",
 
+  "item.page.edit": "Edit this item",
+
   "item.page.files": "Files",
 
   "item.page.filesection.description": "Description:",
@@ -1415,6 +1811,35 @@
 
   "item.page.uri": "URI",
 
+  "item.page.bitstreams.view-more": "Show more",
+
+  "item.page.bitstreams.collapse": "Collapse",
+
+  "item.page.filesection.original.bundle" : "Original bundle",
+
+  "item.page.filesection.license.bundle" : "License bundle",
+
+  "item.preview.dc.identifier.uri": "Identifier:",
+
+  "item.preview.dc.contributor.author": "Authors:",
+
+  "item.preview.dc.date.issued": "Published date:",
+
+  "item.preview.dc.description.abstract": "Abstract:",
+
+  "item.preview.dc.identifier.other": "Other identifier:",
+
+  "item.preview.dc.language.iso": "Language:",
+
+  "item.preview.dc.subject": "Subjects:",
+
+  "item.preview.dc.title": "Title:",
+
+  "item.preview.person.familyName": "Surname:",
+
+  "item.preview.person.givenName": "Name:",
+
+  "item.preview.person.identifier.orcid": "ORCID:",
 
 
   "item.select.confirm": "Confirm selected",
@@ -1456,6 +1881,8 @@
 
   "journal.page.description": "Description",
 
+  "journal.page.edit": "Edit this item",
+
   "journal.page.editor": "Editor-in-Chief",
 
   "journal.page.issn": "ISSN",
@@ -1474,6 +1901,8 @@
 
   "journalissue.page.description": "Description",
 
+  "journalissue.page.edit": "Edit this item",
+
   "journalissue.page.issuedate": "Issue Date",
 
   "journalissue.page.journal-issn": "Journal ISSN",
@@ -1492,6 +1921,8 @@
 
   "journalvolume.page.description": "Description",
 
+  "journalvolume.page.edit": "Edit this item",
+
   "journalvolume.page.issuedate": "Issue Date",
 
   "journalvolume.page.titleprefix": "Journal Volume: ",
@@ -1658,6 +2089,8 @@
 
   "menu.section.icon.pin": "Pin sidebar",
 
+  "menu.section.icon.processes": "Processes menu section",
+
   "menu.section.icon.registries": "Registries menu section",
 
   "menu.section.icon.statistics_task": "Statistics Task menu section",
@@ -1684,6 +2117,8 @@
 
   "menu.section.new_item_version": "Item Version",
 
+  "menu.section.new_process": "Process",
+
 
 
   "menu.section.pin": "Pin sidebar",
@@ -1692,6 +2127,10 @@
 
 
 
+  "menu.section.processes": "Processes",
+
+
+
   "menu.section.registries": "Registries",
 
   "menu.section.registries_format": "Format",
@@ -1732,7 +2171,7 @@
 
   "mydspace.description": "",
 
-  "mydspace.general.text-here": "HERE",
+  "mydspace.general.text-here": "here",
 
   "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
 
@@ -1762,6 +2201,10 @@
 
   "mydspace.new-submission": "New submission",
 
+  "mydspace.new-submission-external": "Import metadata from external source",
+
+  "mydspace.new-submission-external-short": "Import metadata",
+
   "mydspace.results.head": "Your submissions",
 
   "mydspace.results.no-abstract": "No Abstract",
@@ -1798,6 +2241,10 @@
 
   "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
 
+  "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+
+  "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+
   "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
 
   "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
@@ -1838,6 +2285,8 @@
 
   "orgunit.page.description": "Description",
 
+  "orgunit.page.edit": "Edit this item",
+
   "orgunit.page.id": "ID",
 
   "orgunit.page.titleprefix": "Organizational Unit: ",
@@ -1856,8 +2305,12 @@
 
   "person.listelement.badge": "Person",
 
+  "person.listelement.no-title": "No name found",
+
   "person.page.birthdate": "Birth Date",
 
+  "person.page.edit": "Edit this item",
+
   "person.page.email": "Email Address",
 
   "person.page.firstname": "First Name",
@@ -1880,6 +2333,97 @@
 
 
 
+  "process.new.select-parameters": "Parameters",
+
+  "process.new.cancel": "Cancel",
+
+  "process.new.submit": "Submit",
+
+  "process.new.select-script": "Script",
+
+  "process.new.select-script.placeholder": "Choose a script...",
+
+  "process.new.select-script.required": "Script is required",
+
+  "process.new.parameter.file.upload-button": "Select file...",
+
+  "process.new.parameter.file.required": "Please select a file",
+
+  "process.new.parameter.string.required": "Parameter value is required",
+
+  "process.new.parameter.type.value": "value",
+
+  "process.new.parameter.type.file": "file",
+
+  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+
+  "process.new.notification.success.title": "Success",
+
+  "process.new.notification.success.content": "The process was successfully created",
+
+  "process.new.notification.error.title": "Error",
+
+  "process.new.notification.error.content": "An error occurred while creating this process",
+
+  "process.new.header": "Create a new process",
+
+  "process.new.title": "Create a new process",
+
+  "process.new.breadcrumbs": "Create a new process",
+
+
+
+  "process.detail.arguments" : "Arguments",
+
+  "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+
+  "process.detail.back" : "Back",
+
+  "process.detail.output" : "Process Output",
+
+  "process.detail.logs.button": "Retrieve process output",
+
+  "process.detail.logs.loading": "Retrieving",
+
+  "process.detail.logs.none": "This process has no output",
+
+  "process.detail.output-files" : "Output Files",
+
+  "process.detail.output-files.empty" : "This process doesn't contain any output files",
+
+  "process.detail.script" : "Script",
+
+  "process.detail.title" : "Process: {{ id }} - {{ name }}",
+
+  "process.detail.start-time" : "Start time",
+
+  "process.detail.end-time" : "Finish time",
+
+  "process.detail.status" : "Status",
+
+  "process.detail.create" : "Create similar process",
+
+
+
+  "process.overview.table.finish" : "Finish time",
+
+  "process.overview.table.id" : "Process ID",
+
+  "process.overview.table.name" : "Name",
+
+  "process.overview.table.start" : "Start time",
+
+  "process.overview.table.status" : "Status",
+
+  "process.overview.table.user" : "User",
+
+  "process.overview.title": "Processes Overview",
+
+  "process.overview.breadcrumbs": "Processes Overview",
+
+  "process.overview.new": "New",
+
+
   "profile.breadcrumbs": "Update Profile",
 
   "profile.card.identify": "Identify",
@@ -2002,6 +2546,8 @@
 
   "project.page.description": "Description",
 
+  "project.page.edit": "Edit this item",
+
   "project.page.expectedcompletion": "Expected Completion",
 
   "project.page.funder": "Funders",
@@ -2022,6 +2568,8 @@
 
   "publication.page.description": "Description",
 
+  "publication.page.edit": "Edit this item",
+
   "publication.page.journal-issn": "Journal ISSN",
 
   "publication.page.journal-title": "Journal Title",
@@ -2037,9 +2585,81 @@
   "publication.search.title": "DSpace Angular :: Publication Search",
 
 
+  "register-email.title": "New user registration",
+
+  "register-page.create-profile.header": "Create Profile",
+
+  "register-page.create-profile.identification.header": "Identify",
+
+  "register-page.create-profile.identification.email": "Email Address",
+
+  "register-page.create-profile.identification.first-name": "First Name *",
+
+  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+
+  "register-page.create-profile.identification.last-name": "Last Name *",
+
+  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+
+  "register-page.create-profile.identification.contact": "Contact Telephone",
+
+  "register-page.create-profile.identification.language": "Language",
+
+  "register-page.create-profile.security.header": "Security",
+
+  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+
+  "register-page.create-profile.security.label.password": "Password *",
+
+  "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+
+  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+
+  "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+
+  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+
+  "register-page.create-profile.submit": "Complete Registration",
+
+  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+
+  "register-page.create-profile.submit.error.head": "Registration failed",
+
+  "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
+
+  "register-page.create-profile.submit.success.head": "Registration completed",
+
+
+  "register-page.registration.header": "New user registration",
+
+  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+
+  "register-page.registration.email": "Email Address *",
+
+  "register-page.registration.email.error.required": "Please fill in an email address",
+
+  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+
+  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+
+  "register-page.registration.submit": "Register",
+
+  "register-page.registration.success.head": "Verification email sent",
+
+  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+
+  "register-page.registration.error.head": "Error when trying to register email",
+
+  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+
+
 
   "relationships.isAuthorOf": "Authors",
 
+  "relationships.isAuthorOf.Person": "Authors (persons)",
+
+  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+
   "relationships.isIssueOf": "Journal Issues",
 
   "relationships.isJournalIssueOf": "Journal Issue",
@@ -2066,6 +2686,108 @@
 
 
 
+  "resource-policies.add.button": "Add",
+
+  "resource-policies.add.for.": "Add a new policy",
+
+  "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+
+  "resource-policies.add.for.bundle": "Add a new Bundle policy",
+
+  "resource-policies.add.for.item": "Add a new Item policy",
+
+  "resource-policies.add.for.community": "Add a new Community policy",
+
+  "resource-policies.add.for.collection": "Add a new Collection policy",
+
+  "resource-policies.create.page.heading": "Create new resource policy for ",
+
+  "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+
+  "resource-policies.create.page.success.content": "Operation successful",
+
+  "resource-policies.create.page.title": "Create new resource policy",
+
+  "resource-policies.delete.btn": "Delete selected",
+
+  "resource-policies.delete.btn.title": "Delete selected resource policies",
+
+  "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+
+  "resource-policies.delete.success.content": "Operation successful",
+
+  "resource-policies.edit.page.heading": "Edit resource policy ",
+
+  "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+
+  "resource-policies.edit.page.success.content": "Operation successful",
+
+  "resource-policies.edit.page.title": "Edit resource policy",
+
+  "resource-policies.form.action-type.label": "Select the action type",
+
+  "resource-policies.form.action-type.required": "You must select the resource policy action.",
+
+  "resource-policies.form.eperson-group-list.label": "The eperson or group that will be grant of the permission",
+
+  "resource-policies.form.eperson-group-list.select.btn": "Select",
+
+  "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+
+  "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+
+  "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+
+  "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+
+  "resource-policies.form.date.end.label": "End Date",
+
+  "resource-policies.form.date.start.label": "Start Date",
+
+  "resource-policies.form.description.label": "Description",
+
+  "resource-policies.form.name.label": "Name",
+
+  "resource-policies.form.policy-type.label": "Select the policy type",
+
+  "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+
+  "resource-policies.table.headers.action": "Action",
+
+  "resource-policies.table.headers.date.end": "End Date",
+
+  "resource-policies.table.headers.date.start": "Start Date",
+
+  "resource-policies.table.headers.edit": "Edit",
+
+  "resource-policies.table.headers.edit.group": "Edit group",
+
+  "resource-policies.table.headers.edit.policy": "Edit policy",
+
+  "resource-policies.table.headers.eperson": "EPerson",
+
+  "resource-policies.table.headers.group": "Group",
+
+  "resource-policies.table.headers.id": "ID",
+
+  "resource-policies.table.headers.name": "Name",
+
+  "resource-policies.table.headers.policyType": "type",
+
+  "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+
+  "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+
+  "resource-policies.table.headers.title.for.item": "Policies for Item",
+
+  "resource-policies.table.headers.title.for.community": "Policies for Community",
+
+  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+
+
+
   "search.description": "",
 
   "search.switch-configuration.title": "Show",
@@ -2268,6 +2990,10 @@
 
 
 
+  "sorting.ASC": "Ascending",
+
+  "sorting.DESC": "Descending",
+
   "sorting.dc.title.ASC": "Title Ascending",
 
   "sorting.dc.title.DESC": "Title Descending",
@@ -2276,6 +3002,30 @@
 
 
 
+  "statistics.title": "Statistics",
+
+  "statistics.header": "Statistics for {{ scope }}",
+
+  "statistics.breadcrumbs": "Statistics",
+
+  "statistics.page.no-data": "No data available",
+
+  "statistics.table.no-data": "No data available",
+
+  "statistics.table.title.TotalVisits": "Total visits",
+
+  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+
+  "statistics.table.title.TotalDownloads": "File Visits",
+
+  "statistics.table.title.TopCountries": "Top country views",
+
+  "statistics.table.title.TopCities": "Top city views",
+
+  "statistics.table.header.views": "Views",
+
+
+
   "submission.edit.title": "Edit Submission",
 
   "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
@@ -2297,12 +3047,51 @@
   "submission.general.save-later": "Save for later",
 
 
+  "submission.import-external.page.title": "Import metadata from an external source",
+
+  "submission.import-external.title": "Import metadata from an external source",
+
+  "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
+
+  "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+
+  "submission.import-external.search.placeholder": "Search the external source",
+
+  "submission.import-external.search.button": "Search",
+
+  "submission.import-external.search.button.hint": "Write some words to search",
+
+  "submission.import-external.search.source.hint": "Pick an external source",
+
+  "submission.import-external.source.arxiv": "arXiv",
+
+  "submission.import-external.source.loading": "Loading ...",
+
+  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+
+  "submission.import-external.source.orcid": "ORCID",
+
+  "submission.import-external.source.pubmed": "Pubmed",
+
+  "submission.import-external.source.lcname": "Library of Congress Names",
+
+  "submission.import-external.preview.title": "Item Preview",
+
+  "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
+
+  "submission.import-external.preview.button.import": "Start submission",
+
+  "submission.import-external.preview.error.import.title": "Submission error",
+
+  "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
 
   "submission.sections.describe.relationship-lookup.close": "Close",
 
   "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Author": "Import remote author",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
 
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
 
@@ -2310,11 +3099,11 @@
 
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Author.title": "Import Remote Author",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Author.added.local-entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Author.added.new-entity": "Successfully imported and added external author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
 
@@ -2330,12 +3119,16 @@
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
+
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
@@ -2374,39 +3167,77 @@
 
   "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Author": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal Issue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal Volume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Funding Agency": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Funding": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
 
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
 
-  "submission.sections.describe.relationship-lookup.title.Journal Issue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
 
-  "submission.sections.describe.relationship-lookup.title.Journal Volume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
 
-  "submission.sections.describe.relationship-lookup.title.Journal": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
 
-  "submission.sections.describe.relationship-lookup.title.Author": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+
+  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
 
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
 
-  "submission.sections.describe.relationship-lookup.title.Funding": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
 
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
 
@@ -2414,28 +3245,69 @@
 
   "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Author": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal Volume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal Issue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+
   "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
 
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
 
   "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
 
+  "submission.sections.ccLicense.type": "License Type",
+
+  "submission.sections.ccLicense.select": "Select a license type…",
+
+  "submission.sections.ccLicense.change": "Change your license type…",
+
+  "submission.sections.ccLicense.none": "No licenses available",
+
+  "submission.sections.ccLicense.option.select": "Select an option…",
+
+  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+
+  "submission.sections.ccLicense.confirmation": "I grant the license above",
+
   "submission.sections.general.add-more": "Add more",
 
   "submission.sections.general.collection": "Collection",
@@ -2466,7 +3338,7 @@
 
 
 
-  "submission.sections.submit.progressbar.cclicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
 
   "submission.sections.submit.progressbar.describe.recycle": "Recycle",
 
@@ -2599,6 +3471,24 @@
   "title": "DSpace",
 
 
+
+
+  "vocabulary-treeview.header": "Hierarchical tree view",
+
+  "vocabulary-treeview.load-more": "Load more",
+
+  "vocabulary-treeview.search.form.reset": "Reset",
+
+  "vocabulary-treeview.search.form.search": "Search",
+
+  "vocabulary-treeview.search.no-result": "There were no items to show",
+
+  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+
+  "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+
+
+
   "administrativeView.search.results.head": "Administrative Search",
 
   "menu.section.admin_search": "Admin Search",
@@ -2609,7 +3499,7 @@
 
   "uploader.drag-message": "Drag & Drop your files here",
 
-  "uploader.or": ", or",
+  "uploader.or": ", or ",
 
   "uploader.processing": "Processing",
 
@@ -2658,6 +3548,6 @@
 
   "workflow-item.send-back.button.cancel": "Cancel",
 
-  "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "Send back"
 }
 
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 3e27fb3b04c..4eeff3356c7 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -3539,9 +3539,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -3651,9 +3651,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -3731,9 +3731,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index d7afa97f085..7253c526a6d 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -1,236 +1,179 @@
 {
   
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
-  // TODO New key - Add a translation
-  "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
+  "404.help": "Hakemaasi sivua ei löytynyt. Sivu on voitu siirtää tai poistaa. Painamalla alapuolella olevaa nappia palaat kotisivulle. ",
   
   // "404.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "404.link.home-page": "Take me to the home page",
+  "404.link.home-page": "Palaa kotisivulle",
   
   // "404.page-not-found": "page not found",
-  // TODO New key - Add a translation
-  "404.page-not-found": "page not found",
+  "404.page-not-found": "sivua ei löytynyt",
   
   
   
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "Virhe uutta tiedostoformaattia luotaessa.",
   
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Virhe",
   
   // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Luo tiedostoformaatti",
   
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "Lisää uusi tiedostoformaatti",
   
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "Uusi tiedostoformaatti luotu.",
   
   // "admin.registries.bitstream-formats.create.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "Valmis",
   
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "{{ amount }} formaatin poisto epäonnistui",
   
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "Virhe",
   
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "Poistettu {{ amount }} formaatti(a)",
   
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "Valmis",
   
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "Tässä luetellaan tiedostoformaatit ja niiden tukitasot.",
   
   // "admin.registries.bitstream-formats.edit.description.hint": "",
-  // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.description.hint": "",
   
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "Kuvaus",
   
   // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Tarkenteet ovat tiedostopäätteitä, joita käytetään tallennettujen tiedostojen formaatin automaattiseen tunnistamiseen. Yhtä formaattia voi vastata useampi tiedostopääte.",
   
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Tiedostopäätteet",
   
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Lisää tiedostopääte ilman pistettä",
   
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Virhe tiedostoformaattia muokattaessa.",
   
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "Virhe",
   
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Tiedostoformaatti: {{ format }}",
   
   // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Sisäisiksi merkittyjä formaatteja käytetään hallinnollisiin tarkoituksiin, ja ne on piilotettu käyttäjiltä.",
   
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label": "Sisäinen",
   
   // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "Tiedostoformaatin MIME-tyyppi. MIME-tyypin ei tarvitse olla yksilöllinen.",
   
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME-tyyppi",
   
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Formaatin yksilöllinen nimi (esim. Microsoft Word XP tai Microsoft Word 2000)",
   
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Nimi",
   
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "Tiedostoformaattia muokattu.",
   
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "Valmis",
   
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Tukitaso, jonka järjestelmää ylläpitävä instituutio takaa tiedostoformaatille.",
   
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Tukitaso",
   
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "Tiedostoformaattirekisteri",
   
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "Ei tiedostoformaatteja.",
   
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "Poista valittu",
   
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Poista kaikkien valinta",
   
   // "admin.registries.bitstream-formats.table.internal": "internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "sisäinen",
   
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "MIME-tyyppi",
   
   // "admin.registries.bitstream-formats.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "Nimi",
   
   // "admin.registries.bitstream-formats.table.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.return": "Return",
+  "admin.registries.bitstream-formats.table.return": "Paluu",
   
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Tunnettu",
   
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Tuettu",
   
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Tuntematon",
   
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Tukitaso",
   
   // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "DSpace Angular :: Tiedostoformaattirekisteri",
   
   
   
   // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
+  "admin.registries.metadata.description": "Metadatarekisteriin on koottu tässä julkaisuarkistossa käytössä olevat metadatakentät. Kentät voivat jakautua eri skeemoihin. DSpace-alusta edellyttää Qualified Dublin Core -skeeman käyttöä.",
   
   // "admin.registries.metadata.form.create": "Create metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Luo metadataskeema",
   
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Muokkaa metadataskeemaa",
   
   // "admin.registries.metadata.form.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "Nimi",
   
   // "admin.registries.metadata.form.namespace": "Namespace",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "Nimiavaruus",
   
   // "admin.registries.metadata.head": "Metadata Registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "Metadatarekisteri",
   
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "Ei metadataskeemoja.",
   
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Poista valittu",
   
   // "admin.registries.metadata.schemas.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "ID-tunnus",
   
   // "admin.registries.metadata.schemas.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "Nimi",
   
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "Nimiavaruus",
   
   // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
+  "admin.registries.metadata.title": "DSpace Angular :: Metadatarekisteri",
   
   
   
@@ -239,96 +182,77 @@
   "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "Skeeman metadatakentät",
   
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "Ei metadatakenttiä.",
   
   // "admin.registries.schema.fields.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "Poista valittu",
   
   // "admin.registries.schema.fields.table.field": "Field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field": "Kenttä",
   
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "Soveltamisala",
   
   // "admin.registries.schema.form.create": "Create metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Luo metadatakenttä",
   
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Muokkaa metadatakenttää",
   
   // "admin.registries.schema.form.element": "Element",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Elementti",
   
   // "admin.registries.schema.form.qualifier": "Qualifier",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Tarkenne",
   
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Soveltamisala",
   
   // "admin.registries.schema.head": "Metadata Schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "Metadataskeema",
   
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "{{amount}} metadataskeeman poisto epäonnistui ",
   
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "{{amount}} metadataskeemaa poistettu",
   
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   
   // "admin.registries.schema.notification.failure": "Error",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Virhe",
   
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "{{amount}} metadatakentän poisto epäonnistui",
   
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "{{amount}} metadatakenttää poistettu",
   
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   
   // "admin.registries.schema.notification.success": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "Valmis",
   
   // "admin.registries.schema.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.schema.return": "Return",
+  "admin.registries.schema.return": "Paluu",
   
   // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  // TODO New key - Add a translation
-  "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
+  "admin.registries.schema.title": "DSpace Angular :: Metadataskeemarekisteri",
   
   
   
@@ -784,12 +708,10 @@
   
   
   // "auth.errors.invalid-user": "Invalid email address or password.",
-  // TODO New key - Add a translation
-  "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "Virheellinen sähköpostiosoite tai salasana.",
   
   // "auth.messages.expired": "Your session has expired. Please log in again.",
-  // TODO New key - Add a translation
-  "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "Istuntosi on vanhentunut. Kirjaudu uudelleen.",
   
   
   
@@ -864,44 +786,34 @@
   
   
   // "browse.comcol.by.author": "By Author",
-  // TODO New key - Add a translation
-  "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "Tekijän mukaan",
   
   // "browse.comcol.by.dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "Julkaisuajan mukaan",
   
   // "browse.comcol.by.subject": "By Subject",
-  // TODO New key - Add a translation
-  "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "Avainsanan mukaan",
   
   // "browse.comcol.by.title": "By Title",
-  // TODO New key - Add a translation
-  "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "Nimekkeen mukaan",
   
   // "browse.comcol.head": "Browse",
-  // TODO New key - Add a translation
-  "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Selaa",
   
   // "browse.empty": "No items to show.",
-  // TODO New key - Add a translation
-  "browse.empty": "No items to show.",
+  "browse.empty": "Ei tietueita.",
   
   // "browse.metadata.author": "Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author": "Author",
+  "browse.metadata.author": "Tekijä",
   
   // "browse.metadata.dateissued": "Issue Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Julkaisuaika",
   
   // "browse.metadata.subject": "Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Aihe",
   
   // "browse.metadata.title": "Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title": "Title",
+  "browse.metadata.title": "Nimeke",
   
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   // TODO New key - Add a translation
@@ -920,123 +832,95 @@
   "browse.metadata.title.breadcrumbs": "Browse by Title",
   
   // "browse.startsWith.choose_start": "(Choose start)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(Valitse alku)",
   
   // "browse.startsWith.choose_year": "(Choose year)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(Valitse vuosi)",
   
   // "browse.startsWith.jump": "Jump to a point in the index:",
-  // TODO New key - Add a translation
-  "browse.startsWith.jump": "Jump to a point in the index:",
+  "browse.startsWith.jump": "Hyppää indeksin kohtaan:",
   
   // "browse.startsWith.months.april": "April",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "Huhtikuu",
   
   // "browse.startsWith.months.august": "August",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "Elokuu",
   
   // "browse.startsWith.months.december": "December",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "Joulukuu",
   
   // "browse.startsWith.months.february": "February",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "Helmikuu",
   
   // "browse.startsWith.months.january": "January",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "Tammikuu",
   
   // "browse.startsWith.months.july": "July",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "Heinäkuu",
   
   // "browse.startsWith.months.june": "June",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "Kesäkuu",
   
   // "browse.startsWith.months.march": "March",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "Maaliskuu",
   
   // "browse.startsWith.months.may": "May",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "Toukokuu",
   
   // "browse.startsWith.months.none": "(Choose month)",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Valitse kuukausi)",
   
   // "browse.startsWith.months.november": "November",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "Marraskuu",
   
   // "browse.startsWith.months.october": "October",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "Lokakuu",
   
   // "browse.startsWith.months.september": "September",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "Syyskuu",
   
   // "browse.startsWith.submit": "Go",
-  // TODO New key - Add a translation
-  "browse.startsWith.submit": "Go",
+  "browse.startsWith.submit": "Käynnistä",
   
   // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_date": "Or type in a date (year-month):",
+  "browse.startsWith.type_date": "Tai anna päiväys (vuosi-kuukausi):",
   
   // "browse.startsWith.type_text": "Or enter first few letters:",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_text": "Or enter first few letters:",
+  "browse.startsWith.type_text": "Tai anna muutama alkukirjain:",
   
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  // TODO New key - Add a translation
-  "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title": "Selataan {{ collection }}-kokoelmaa {{ field }}-kentän arvolla {{ value }}",
   
   
   // "chips.remove": "Remove chip",
-  // TODO New key - Add a translation
-  "chips.remove": "Remove chip",
+  "chips.remove": "Poista chip",
   
   
   
   // "collection.create.head": "Create a Collection",
-  // TODO New key - Add a translation
-  "collection.create.head": "Create a Collection",
+  "collection.create.head": "Luo kokoelma",
   
   // "collection.create.notifications.success": "Successfully created the Collection",
   // TODO New key - Add a translation
   "collection.create.notifications.success": "Successfully created the Collection",
   
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "Luo kokoelma {{ parent }}-yhteisöön",
   
   // "collection.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "Peruuta",
   
   // "collection.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Vahvista",
   
   // "collection.delete.head": "Delete Collection",
-  // TODO New key - Add a translation
-  "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Poista kokoelma",
   
   // "collection.delete.notification.fail": "Collection could not be deleted",
-  // TODO New key - Add a translation
-  "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "Kokoelman poisto epäonnistui",
   
   // "collection.delete.notification.success": "Successfully deleted collection",
-  // TODO New key - Add a translation
-  "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "Kokoelma poistettu",
   
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   // TODO New key - Add a translation
@@ -1045,12 +929,10 @@
   
   
   // "collection.edit.delete": "Delete this collection",
-  // TODO New key - Add a translation
-  "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Poista kokoelma",
   
   // "collection.edit.head": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Muokkaa kokoelmaa",
   
   // "collection.edit.breadcrumbs": "Edit Collection",
   // TODO New key - Add a translation
@@ -1059,72 +941,56 @@
   
   
   // "collection.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "Peruuta",
   
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   
   // "collection.edit.item-mapper.confirm": "Map selected items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "Liitä valitut tietueet",
   
   // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+  "collection.edit.item-mapper.description": "Tällä työkalulla kokoelmien ylläpitäjät voivat liittää tietueita muista kokoelmista tähän kokoelmaan. Voit etsiä tietueita muista kokoelmista ja liittää ne tähän kokoelmaan tai selata luetteloa tähän kokoelmaan liitetyistä tietueista.",
   
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Tietueliitosväline - Liitä tietueita muista kokoelmista",
   
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "Anna hakulauseke",
   
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "Virheitä liitettäessä {{amount}} tietuetta.",
   
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "Virheitä liitoksissa",
   
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "Liitetty {{amount}} tietuetta.",
   
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "Liitos valmis",
   
   // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Virheitä {{amount}} tietueen liitoksia poistettaessa.",
   
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Poista virheelliset liitokset",
   
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Poistettu {{amount}} tietueen liitokset.",
   
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Liitosten poisto valmis",
   
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Poista valitut tietueliitokset",
   
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Selaa liitettyjä tietueita",
   
   // "collection.edit.item-mapper.tabs.map": "Map new items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "Liitä uusia tietueita",
   
   
   
@@ -1267,72 +1133,56 @@
   
   
   // "collection.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Lyhyt kuvaus",
   
   // "collection.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Johdantoteksti (HTML)",
   
   // "collection.form.errors.title.required": "Please enter a collection name",
-  // TODO New key - Add a translation
-  "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Anna kokoelman nimi",
   
   // "collection.form.license": "License",
-  // TODO New key - Add a translation
-  "collection.form.license": "License",
+  "collection.form.license": "Lisenssi",
   
   // "collection.form.provenance": "Provenance",
-  // TODO New key - Add a translation
-  "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Provenanssi",
   
   // "collection.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Tekijänoikeusteksti (HTML)",
   
   // "collection.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "Uutiset (HTML)",
   
   // "collection.form.title": "Name",
-  // TODO New key - Add a translation
-  "collection.form.title": "Name",
+  "collection.form.title": "Nimi",
   
   
   
   // "collection.page.browse.recent.head": "Recent Submissions",
-  // TODO New key - Add a translation
-  "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.page.browse.recent.head": "Viimeksi lisätyt",
   
   // "collection.page.browse.recent.empty": "No items to show",
-  // TODO New key - Add a translation
   "collection.page.browse.recent.empty": "No items to show",
   
   // "collection.page.handle": "Permanent URI for this collection",
-  // TODO New key - Add a translation
-  "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "Kokoelman pysyvä URL-osoite",
   
   // "collection.page.license": "License",
-  // TODO New key - Add a translation
-  "collection.page.license": "License",
+  "collection.page.license": "Lisenssi",
   
   // "collection.page.news": "News",
-  // TODO New key - Add a translation
-  "collection.page.news": "News",
+  "collection.page.news": "Uutiset",
   
   
   
   // "collection.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Vahvista valinta",
   
   // "collection.select.empty": "No collections to show",
-  // TODO New key - Add a translation
-  "collection.select.empty": "No collections to show",
+  "collection.select.empty": "Ei kokoelmia",
   
   // "collection.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "collection.select.table.title": "Title",
+  "collection.select.table.title": "Nimeke",
   
   
   
@@ -1361,48 +1211,39 @@
   
   
   // "community.create.head": "Create a Community",
-  // TODO New key - Add a translation
-  "community.create.head": "Create a Community",
+  "community.create.head": "Luo yhteisö",
   
   // "community.create.notifications.success": "Successfully created the Community",
   // TODO New key - Add a translation
   "community.create.notifications.success": "Successfully created the Community",
   
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Luo alayhteisö {{ parent }}-yhteisölle",
   
   // "community.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "Peruuta",
   
   // "community.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Vahvista",
   
   // "community.delete.head": "Delete Community",
-  // TODO New key - Add a translation
-  "community.delete.head": "Delete Community",
+  "community.delete.head": "Poista yhteisö",
   
   // "community.delete.notification.fail": "Community could not be deleted",
-  // TODO New key - Add a translation
-  "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "Yhteisön poisto epäonnistui",
   
   // "community.delete.notification.success": "Successfully deleted community",
-  // TODO New key - Add a translation
-  "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Yhteisö poistettu",
   
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   // TODO New key - Add a translation
   "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   
   // "community.edit.delete": "Delete this community",
-  // TODO New key - Add a translation
-  "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Poista tämä yhteisö",
   
   // "community.edit.head": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.head": "Edit Community",
+  "community.edit.head": "Muokkaa yhteisöä",
   
   // "community.edit.breadcrumbs": "Edit Community",
   // TODO New key - Add a translation
@@ -1476,94 +1317,72 @@
   
   
   // "community.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "community.form.abstract": "Short Description",
+  "community.form.abstract": "Lyhyt kuvaus",
   
   // "community.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Johdantoteksti (HTML)",
   
   // "community.form.errors.title.required": "Please enter a community name",
-  // TODO New key - Add a translation
-  "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Anna kokoelman nimi",
   
   // "community.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Tekijänoikeusteksti (HTML)",
   
   // "community.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "Uutiset (HTML)",
   
   // "community.form.title": "Name",
-  // TODO New key - Add a translation
-  "community.form.title": "Name",
+  "community.form.title": "Nimi",
   
   // "community.page.handle": "Permanent URI for this community",
-  // TODO New key - Add a translation
-  "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "Yhteisön pysyvä URL-osoite",
   
   // "community.page.license": "License",
-  // TODO New key - Add a translation
-  "community.page.license": "License",
+  "community.page.license": "Lisenssi",
   
   // "community.page.news": "News",
-  // TODO New key - Add a translation
-  "community.page.news": "News",
+  "community.page.news": "Uutiset",
   
   // "community.all-lists.head": "Subcommunities and Collections",
-  // TODO New key - Add a translation
-  "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Alayhteisöt ja kokoelmat",
   
   // "community.sub-collection-list.head": "Collections of this Community",
-  // TODO New key - Add a translation
-  "community.sub-collection-list.head": "Collections of this Community",
+  "community.sub-collection-list.head": "Yhteisön kokoelmat",
   
   // "community.sub-community-list.head": "Communities of this Community",
-  // TODO New key - Add a translation
-  "community.sub-community-list.head": "Communities of this Community",
+  "community.sub-community-list.head": "Yhteisön alayhteisöt",
   
   
   
   // "dso-selector.create.collection.head": "New collection",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Uusi kokoelma",
   
   // "dso-selector.create.community.head": "New community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Uusi yhteisö",
   
   // "dso-selector.create.community.sub-level": "Create a new community in",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "Luo uusi yhteisö julkaisuarkistoon",
   
   // "dso-selector.create.community.top-level": "Create a new top-level community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "Luo uusi ylätason yhteisö",
   
   // "dso-selector.create.item.head": "New item",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Uusi tietue",
   
   // "dso-selector.edit.collection.head": "Edit collection",
-  // TODO New key - Add a translation
-  "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Muokkaa kokoelmaa",
   
   // "dso-selector.edit.community.head": "Edit community",
-  // TODO New key - Add a translation
-  "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Muokkaa yhteisöä",
   
   // "dso-selector.edit.item.head": "Edit item",
-  // TODO New key - Add a translation
-  "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Muokkaa tietuetta",
   
   // "dso-selector.no-results": "No {{ type }} found",
-  // TODO New key - Add a translation
-  "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "Ei {{ type }}-tyyppiä.",
   
   // "dso-selector.placeholder": "Search for a {{ type }}",
-  // TODO New key - Add a translation
-  "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "Hae {{ type }}",
   
   
   
@@ -1572,72 +1391,55 @@
   "error.bitstream": "Error fetching bitstream",
   
   // "error.browse-by": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.browse-by": "Error fetching items",
+  "error.browse-by": "Virhe tietueita noudettaessa",
   
   // "error.collection": "Error fetching collection",
-  // TODO New key - Add a translation
-  "error.collection": "Error fetching collection",
+  "error.collection": "Virhe kokoelmaa noudettaessa",
   
   // "error.collections": "Error fetching collections",
-  // TODO New key - Add a translation
-  "error.collections": "Error fetching collections",
+  "error.collections": "Virhe kokoelmia noudettaessa",
   
   // "error.community": "Error fetching community",
-  // TODO New key - Add a translation
-  "error.community": "Error fetching community",
+  "error.community": "Virhe yhteisöä noudettaessa",
   
   // "error.identifier": "No item found for the identifier",
-  // TODO New key - Add a translation
-  "error.identifier": "No item found for the identifier",
+  "error.identifier": "Ei tunnistetta vastaavaa tietuetta",
   
   // "error.default": "Error",
-  // TODO New key - Add a translation
-  "error.default": "Error",
+  "error.default": "Virhe",
   
   // "error.item": "Error fetching item",
-  // TODO New key - Add a translation
-  "error.item": "Error fetching item",
+  "error.item": "Virhe tietuetta noudettaessa",
   
   // "error.items": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.items": "Error fetching items",
+  "error.items": "Virhe tietueita noudettaessa",
   
   // "error.objects": "Error fetching objects",
-  // TODO New key - Add a translation
-  "error.objects": "Error fetching objects",
+  "error.objects": "Virhe kohteita noudettaessa",
   
   // "error.recent-submissions": "Error fetching recent submissions",
-  // TODO New key - Add a translation
-  "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "Virhe viimeksi lisättyjä julkaisuja noudettaessa",
   
   // "error.search-results": "Error fetching search results",
-  // TODO New key - Add a translation
-  "error.search-results": "Error fetching search results",
+  "error.search-results": "Virhe hakutuloksia noudettaessa",
   
   // "error.sub-collections": "Error fetching sub-collections",
-  // TODO New key - Add a translation
-  "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "Virhe alakokoelmia noudettaessa",
   
   // "error.sub-communities": "Error fetching sub-communities",
-  // TODO New key - Add a translation
-  "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "Virhe alayhteisöjä noudettaessa",
   
   // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
-  // TODO New key - Add a translation
-  "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
+  "error.submission.sections.init-form-error": "Virhe osiota alustettaessa, tarkista syöttölomakkeesi asetukset. Lisätietoja alla: <br> <br>",
   
   // "error.top-level-communities": "Error fetching top-level communities",
-  // TODO New key - Add a translation
-  "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "Virhe ylätason yhteisöjä noudettaessa",
   
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  // TODO New key - Add a translation
-  "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
+  "error.validation.license.notgranted": "Julkaisuprosessia ei voi päättää, ellet hyväksy julkaisulisenssiä. Voit myös tallentaa tiedot ja jatkaa tallennusta myöhemmin tai poistaa kaikki syöttämäsi tiedot.",
   
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  // TODO New key - Add a translation
-  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "Syötteen on noudatettava seuraavaa kaavaa: {{ pattern }}.",
   
   // "error.validation.filerequired": "The file upload is mandatory",
   // TODO New key - Add a translation
@@ -1646,15 +1448,12 @@
   
   
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  // TODO New key - Add a translation
-  "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "tekijänoikeus © 2002-{{ year }}",
   
   // "footer.link.dspace": "DSpace software",
-  // TODO New key - Add a translation
-  "footer.link.dspace": "DSpace software",
+  "footer.link.dspace": "DSpace-ohjelmisto",
   
   // "footer.link.duraspace": "DuraSpace",
-  // TODO New key - Add a translation
   "footer.link.duraspace": "DuraSpace",
   
   
@@ -1667,52 +1466,40 @@
   "form.add-help": "Click here to add the current entry and to add another one",
   
   // "form.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "form.cancel": "Cancel",
+  "form.cancel": "Peruuta",
   
   // "form.clear": "Clear",
-  // TODO New key - Add a translation
-  "form.clear": "Clear",
+  "form.clear": "Tyhjennä",
   
   // "form.clear-help": "Click here to remove the selected value",
-  // TODO New key - Add a translation
-  "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Napauta tästä poistaaksesi valitun arvon",
   
   // "form.edit": "Edit",
-  // TODO New key - Add a translation
-  "form.edit": "Edit",
+  "form.edit": "Muokkaa",
   
   // "form.edit-help": "Click here to edit the selected value",
-  // TODO New key - Add a translation
-  "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Napauta tästä muokataksesi valittua arvoa",
   
   // "form.first-name": "First name",
-  // TODO New key - Add a translation
-  "form.first-name": "First name",
+  "form.first-name": "Etunimi",
   
   // "form.group-collapse": "Collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse": "Collapse",
+  "form.group-collapse": "Sulje",
   
   // "form.group-collapse-help": "Click here to collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help": "Sulje napauttamalla",
   
   // "form.group-expand": "Expand",
-  // TODO New key - Add a translation
-  "form.group-expand": "Expand",
+  "form.group-expand": "Laajenna",
   
   // "form.group-expand-help": "Click here to expand and add more elements",
-  // TODO New key - Add a translation
-  "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "Avaa napauttamalla lisätäksesi uusia elementtejä",
   
   // "form.last-name": "Last name",
-  // TODO New key - Add a translation
-  "form.last-name": "Last name",
+  "form.last-name": "Sukunimi",
   
   // "form.loading": "Loading...",
-  // TODO New key - Add a translation
-  "form.loading": "Loading...",
+  "form.loading": "Ladataan...",
   
   // "form.lookup": "Lookup",
   // TODO New key - Add a translation
@@ -1723,58 +1510,45 @@
   "form.lookup-help": "Click here to look up an existing relation",
   
   // "form.no-results": "No results found",
-  // TODO New key - Add a translation
-  "form.no-results": "No results found",
+  "form.no-results": "Ei tuloksia",
   
   // "form.no-value": "No value entered",
-  // TODO New key - Add a translation
-  "form.no-value": "No value entered",
+  "form.no-value": "Ei syötettyä arvoa",
   
   // "form.other-information": {},
-  // TODO New key - Add a translation
   "form.other-information": {},
   
   // "form.remove": "Remove",
-  // TODO New key - Add a translation
-  "form.remove": "Remove",
+  "form.remove": "Poista",
   
   // "form.save": "Save",
-  // TODO New key - Add a translation
-  "form.save": "Save",
+  "form.save": "Tallenna",
   
   // "form.save-help": "Save changes",
-  // TODO New key - Add a translation
-  "form.save-help": "Save changes",
+  "form.save-help": "Tallenna muutokset",
   
   // "form.search": "Search",
-  // TODO New key - Add a translation
-  "form.search": "Search",
+  "form.search": "Hae",
   
   // "form.search-help": "Click here to looking for an existing correspondence",
-  // TODO New key - Add a translation
-  "form.search-help": "Click here to looking for an existing correspondence",
+  "form.search-help": "Valitse etsiäksesi olemassa olevaa vastaavuutta",
   
   // "form.submit": "Submit",
-  // TODO New key - Add a translation
-  "form.submit": "Submit",
+  "form.submit": "Lähetä",
   
   
   
   // "home.description": "",
-  // TODO New key - Add a translation
   "home.description": "",
   
   // "home.title": "DSpace Angular :: Home",
-  // TODO New key - Add a translation
-  "home.title": "DSpace Angular :: Home",
+  "home.title": "DSpace Angular :: Etusivu",
   
   // "home.top-level-communities.head": "Communities in DSpace",
-  // TODO New key - Add a translation
-  "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head": "Julkaisuarkiston yhteisöt",
   
   // "home.top-level-communities.help": "Select a community to browse its collections.",
-  // TODO New key - Add a translation
-  "home.top-level-communities.help": "Select a community to browse its collections.",
+  "home.top-level-communities.help": "Valitse yhteisö, jonka kokoelmia haluat selata.",
   
   
   
@@ -1948,32 +1722,25 @@
   
   
   // "item.edit.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "Peruuta",
   
   // "item.edit.delete.confirm": "Delete",
-  // TODO New key - Add a translation
-  "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "Poista",
   
   // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
-  // TODO New key - Add a translation
-  "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
+  "item.edit.delete.description": "Haluatko varmasti poistaa tiedoston pysyvästi?",
   
   // "item.edit.delete.error": "An error occurred while deleting the item",
-  // TODO New key - Add a translation
-  "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "Virhe tietuetta poistettaessa",
   
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Poista tietue: {{ id }}",
   
   // "item.edit.delete.success": "The item has been deleted",
-  // TODO New key - Add a translation
-  "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "Tietue poistettu",
   
   // "item.edit.head": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.head": "Edit Item",
+  "item.edit.head": "Muokkaa tietuetta",
   
   // "item.edit.breadcrumbs": "Edit Item",
   // TODO New key - Add a translation
@@ -1982,472 +1749,360 @@
   
   
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "Liitä tietue valittuihin kokoelmiin",
   
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "Poista tietueen liitos valituista kokoelmista",
   
   // "item.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "Peruuta",
   
   // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
+  "item.edit.item-mapper.description": "Tällä työkalulla kokoelmien ylläpitäjät voivat liittää tietueen muihin kokoelmiin. Voit hakea kokoelmia ja liittää aineiston niihin tai selata luetteloa kokoelmista, joihin aineisto on liitetty.",
   
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "Tietueliitosväline - Liitä tietue kokoelmiin",
   
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   // TODO New key - Add a translation
   "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "Anna hakulauseke",
   
   // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.error.content": "Virhe liitettäessä tietuetta {{amount}} kokoelmaan.",
   
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "Virhe liitettäessä",
   
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "Tietue liitetty {{amount}} kokoelmaan.",
   
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "Liitos valmis",
   
   // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.error.content": "Virheitä poistettaessa liitosta {{amount}} kokoelmaan.",
   
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "Virheellisten liitosten poisto",
   
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Poistettu tietueen liitos {{amount}} kokoelmasta.",
   
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Liitos poistettu",
   
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Selaa liitettyjä kokoelmia",
   
   // "item.edit.item-mapper.tabs.map": "Map new collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "Liitä uusia kokoelmia",
   
   
   
   // "item.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "Lisää",
   
   // "item.edit.metadata.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "Hylkää",
   
   // "item.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "Muokkaa",
   
   // "item.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Poista",
   
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Kumoa muutokset",
   
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "Lopeta muokkaus",
   
   // "item.edit.metadata.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "Muokkaa",
   
   // "item.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Kenttä",
   
   // "item.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Kieli",
   
   // "item.edit.metadata.headers.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Arvo",
   
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "Valitse oikea metadatakenttä",
   
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "Muutokset hylätty. Valitse 'Kumoa' palauttaaksesi muutokset",
   
   // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  "item.edit.metadata.notifications.discarded.title": "Muutokset hylätty",
   
   // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "item.edit.metadata.notifications.invalid.content": "Muutoksia ei tallennettu. Tarkista kaikkien kenttien oikeellisuus ennen tallennusta.",
   
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "Virheellinen metadata",
   
   // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.metadata.notifications.outdated.content": "Toinen käyttäjä on muuttanut parhaillaan muokkaamaasi tietuetta. Tekemäsi muutokset on hylätty ristiriitojen estämiseksi",
   
   // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  "item.edit.metadata.notifications.outdated.title": "Muutokset vanhentuneet",
   
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "Muutokset tietueen metadataan tallennettu.",
   
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "Metadata tallennettu",
   
   // "item.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Peruuta",
   
   // "item.edit.metadata.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "Tallenna",
   
   
   
   // "item.edit.modify.overview.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Kenttä",
   
   // "item.edit.modify.overview.language": "Language",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Kieli",
   
   // "item.edit.modify.overview.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Arvo",
   
   
   
   // "item.edit.move.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.move.cancel": "Cancel",
+  "item.edit.move.cancel": "Peruuta",
   
   // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
-  // TODO New key - Add a translation
-  "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
+  "item.edit.move.description": "Valitse kokoelma, johon haluat siirtää tietueen. Voit antaa hakulausekkeen kokoelmien määrän pienentämiseksi.",
   
   // "item.edit.move.error": "An error occurred when attempting to move the item",
-  // TODO New key - Add a translation
-  "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "Virhe tietuetta siirrettäessä",
   
   // "item.edit.move.head": "Move item: {{id}}",
-  // TODO New key - Add a translation
-  "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Siirrä tietue: {{id}}",
   
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "Peri auktorisointisäännöt",
   
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "Peri kohdekokoelman oletusauktorisointisäännöt",
   
   // "item.edit.move.move": "Move",
-  // TODO New key - Add a translation
-  "item.edit.move.move": "Move",
+  "item.edit.move.move": "Siirrä",
   
   // "item.edit.move.processing": "Moving...",
-  // TODO New key - Add a translation
-  "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Siirretään...",
   
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
-  // TODO New key - Add a translation
-  "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "Anna hakulauseke kokoelmien etsimiseksi",
   
   // "item.edit.move.success": "The item has been moved successfully",
-  // TODO New key - Add a translation
-  "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "Tietue siirretty",
   
   // "item.edit.move.title": "Move item",
-  // TODO New key - Add a translation
-  "item.edit.move.title": "Move item",
+  "item.edit.move.title": "Siirrä tietue",
   
   
   
   // "item.edit.private.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "Peruuta",
   
   // "item.edit.private.confirm": "Make it Private",
-  // TODO New key - Add a translation
-  "item.edit.private.confirm": "Make it Private",
+  "item.edit.private.confirm": "Muuta yksityiseksi",
   
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  "item.edit.private.description": "Oletko varma, että haluat muuttaa tietueen yksityiseksi?",
   
   // "item.edit.private.error": "An error occurred while making the item private",
-  // TODO New key - Add a translation
-  "item.edit.private.error": "An error occurred while making the item private",
+  "item.edit.private.error": "Virhe muutettaessa tietuetta yksityiseksi",
   
   // "item.edit.private.header": "Make item private: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.private.header": "Make item private: {{ id }}",
+  "item.edit.private.header": "Muuta yksityiseksi tietue: {{ id }}",
   
   // "item.edit.private.success": "The item is now private",
-  // TODO New key - Add a translation
-  "item.edit.private.success": "The item is now private",
+  "item.edit.private.success": "Tietue on yksityinen",
   
   
   
   // "item.edit.public.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "Peruuta",
   
   // "item.edit.public.confirm": "Make it Public",
-  // TODO New key - Add a translation
-  "item.edit.public.confirm": "Make it Public",
+  "item.edit.public.confirm": "Muuta julkiseksi",
   
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  "item.edit.public.description": "Oletko varma, että haluat muuttaa tietueen julkiseksi?",
   
   // "item.edit.public.error": "An error occurred while making the item public",
-  // TODO New key - Add a translation
-  "item.edit.public.error": "An error occurred while making the item public",
+  "item.edit.public.error": "Virhe muutettaessa tietuetta julkiseksi",
   
   // "item.edit.public.header": "Make item public: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.public.header": "Make item public: {{ id }}",
+  "item.edit.public.header": "Muuta julkiseksi tietue: {{ id }}",
   
   // "item.edit.public.success": "The item is now public",
-  // TODO New key - Add a translation
-  "item.edit.public.success": "The item is now public",
+  "item.edit.public.success": "Tietue on julkinen",
   
   
   
   // "item.edit.reinstate.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "Peruuta",
   
   // "item.edit.reinstate.confirm": "Reinstate",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Palauta",
   
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "Oletko varma, että haluat palauttaa tietueen käyttöön?",
   
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "Virhe palautettaessa tietuetta käyttöön",
   
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Palauta käyttöön tietue: {{ id }}",
   
   // "item.edit.reinstate.success": "The item was reinstated successfully",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "Tietue palautettu käyttöön",
   
   
   
   // "item.edit.relationships.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Hylkää",
   
   // "item.edit.relationships.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Poista",
   
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Peruuta muutokset",
   
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "Muutoksesi hylättiin. Valitse 'Peruuta' palauttaaksesi ne.",
   
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Muutokset hylätty",
   
   // "item.edit.relationships.notifications.failed.title": "Error deleting relationship",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.failed.title": "Error deleting relationship",
+  "item.edit.relationships.notifications.failed.title": "Virhe yhteyksiä poistettaessa",
   
   // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.relationships.notifications.outdated.content": "Toinen käyttäjä on muuttanut parhaillaan muokkaamaasi tietuetta. Tekemäsi muutokset on hylätty ristiriitojen estämiseksi",
   
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "Muutokset vanhentuneet",
   
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "Muutokset tietueen yhteyksiin tallennettu.",
   
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "Yhteydet tallennettu",
   
   // "item.edit.relationships.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Peruuta",
   
   // "item.edit.relationships.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "Tallenna",
   
   
   
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Tietueen tiedostot",
   
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Tietueen muokkaus - Tiedostot",
   
   // "item.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "Kuratoi",
   
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "Tietueen muokkaus - Kuratointi",
   
   // "item.edit.tabs.metadata.head": "Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "Tietueen metadata",
   
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Tietueen muokkaus -  Metadata",
   
   // "item.edit.tabs.relationships.head": "Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "Tietueen yhteydet",
   
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Tietueen muokkaus - Yhteydet",
   
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "Käyttöoikeudet...",
   
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "Muokkaa tietueen käyttöoikeussääntöjä",
   
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "Poista pysyvästi",
   
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "Poista tietue kokonaan",
   
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Liitetyt kokoelmat",
   
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Hallinnoi liitettyjä kokoelmia",
   
   // "item.edit.tabs.status.buttons.move.button": "Move...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Siirrä...",
   
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "Siirrä tietue toiseen kokoelmaan",
   
   // "item.edit.tabs.status.buttons.private.button": "Make it private...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  "item.edit.tabs.status.buttons.private.button": "Muuta yksityiseksi...",
   
   // "item.edit.tabs.status.buttons.private.label": "Make item private",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.label": "Make item private",
+  "item.edit.tabs.status.buttons.private.label": "Muuta tietue yksityiseksi",
   
   // "item.edit.tabs.status.buttons.public.button": "Make it public...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  "item.edit.tabs.status.buttons.public.button": "Muuta julkiseksi...",
   
   // "item.edit.tabs.status.buttons.public.label": "Make item public",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.label": "Make item public",
+  "item.edit.tabs.status.buttons.public.label": "Muuta tietue julkiseksi",
   
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Palauta käyttöön...",
   
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "Palauta tietue arkistoon",
   
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Poista käytöstä...",
   
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label": "Poista tietue käytöstä",
   
   // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
+  "item.edit.tabs.status.description": "Tervetuloa tietueen hallintasivulle. Täällä voit poistaa käytöstä, palauttaa käyttöön, siirtää tai poistaa tietueen. Voit myös päivittää tai lisätä uutta metadataa / tiedostoja muilla välilehdillä.",
   
   // "item.edit.tabs.status.head": "Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "Tietueen tila",
   
   // "item.edit.tabs.status.labels.handle": "Handle",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "Handle-tunnus",
   
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "Tietueen sisäinen ID-tunnus",
   
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Tietueen tiedot",
   
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Viimeksi muokattu",
   
   // "item.edit.tabs.status.title": "Item Edit -  Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Tietueen muokkaus -  Tila",
   
   // "item.edit.tabs.versionhistory.head": "Version History",
   // TODO New key - Add a translation
@@ -2462,108 +2117,83 @@
   "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
   
   // "item.edit.tabs.view.head": "View Item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Näytä tietue",
   
   // "item.edit.tabs.view.title": "Item Edit -  View",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "Tietueen muokkaus -  Näytä",
   
   
   
   // "item.edit.withdraw.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "Peruuta",
   
   // "item.edit.withdraw.confirm": "Withdraw",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Poista käytöstä",
   
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "Oletko varma tietueen käytöstä poistamisesta?",
   
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "Virhe tietuetta käytöstä poistettaessa",
   
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Poistettu käytöstä tietue: {{ id }}",
   
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "Tietue poistettu käytöstä",
   
   
   
   // "item.page.abstract": "Abstract",
-  // TODO New key - Add a translation
-  "item.page.abstract": "Abstract",
+  "item.page.abstract": "Tiivistelmä",
   
   // "item.page.author": "Authors",
-  // TODO New key - Add a translation
-  "item.page.author": "Authors",
+  "item.page.author": "Tekijät",
   
   // "item.page.citation": "Citation",
-  // TODO New key - Add a translation
-  "item.page.citation": "Citation",
+  "item.page.citation": "Viittaus",
   
   // "item.page.collections": "Collections",
-  // TODO New key - Add a translation
-  "item.page.collections": "Collections",
+  "item.page.collections": "Kokoelmat",
   
   // "item.page.date": "Date",
-  // TODO New key - Add a translation
-  "item.page.date": "Date",
+  "item.page.date": "Päivämäärä",
   
   // "item.page.files": "Files",
-  // TODO New key - Add a translation
-  "item.page.files": "Files",
+  "item.page.files": "Tiedostot",
   
   // "item.page.filesection.description": "Description:",
-  // TODO New key - Add a translation
-  "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Kuvaus:",
   
   // "item.page.filesection.download": "Download",
-  // TODO New key - Add a translation
-  "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "Lataa",
   
   // "item.page.filesection.format": "Format:",
-  // TODO New key - Add a translation
-  "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Formaatti:",
   
   // "item.page.filesection.name": "Name:",
-  // TODO New key - Add a translation
-  "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Nimi:",
   
   // "item.page.filesection.size": "Size:",
-  // TODO New key - Add a translation
-  "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Koko:",
   
   // "item.page.journal.search.title": "Articles in this journal",
-  // TODO New key - Add a translation
-  "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Artikkelit tässä julkaisussa",
   
   // "item.page.link.full": "Full item page",
-  // TODO New key - Add a translation
-  "item.page.link.full": "Full item page",
+  "item.page.link.full": "Tietueen kaikki tiedot",
   
   // "item.page.link.simple": "Simple item page",
-  // TODO New key - Add a translation
-  "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "Tietueen suppeat tiedot",
   
   // "item.page.person.search.title": "Articles by this author",
-  // TODO New key - Add a translation
-  "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Tekijän artikkelit",
   
   // "item.page.related-items.view-more": "Show {{ amount }} more",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "Näytä lisää",
   
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "Näytä vähemmän",
   
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   // TODO New key - Add a translation
@@ -2582,34 +2212,27 @@
   "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   
   // "item.page.subject": "Keywords",
-  // TODO New key - Add a translation
-  "item.page.subject": "Keywords",
+  "item.page.subject": "Avainsanat",
   
   // "item.page.uri": "URI",
-  // TODO New key - Add a translation
-  "item.page.uri": "URI",
+  "item.page.uri": "URL-osoite",
   
   
   
   // "item.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Vahvista valinta",
   
   // "item.select.empty": "No items to show",
-  // TODO New key - Add a translation
-  "item.select.empty": "No items to show",
+  "item.select.empty": "Ei tietueita",
   
   // "item.select.table.author": "Author",
-  // TODO New key - Add a translation
-  "item.select.table.author": "Author",
+  "item.select.table.author": "Tekijä",
   
   // "item.select.table.collection": "Collection",
-  // TODO New key - Add a translation
-  "item.select.table.collection": "Collection",
+  "item.select.table.collection": "Kokoelma",
   
   // "item.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "item.select.table.title": "Title",
+  "item.select.table.title": "Nimeke",
   
   
   // "item.version.history.empty": "There are no other versions for this item yet.",
@@ -2657,92 +2280,71 @@
   
   
   // "journal.listelement.badge": "Journal",
-  // TODO New key - Add a translation
-  "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Kausijulkaisu",
   
   // "journal.page.description": "Description",
-  // TODO New key - Add a translation
-  "journal.page.description": "Description",
+  "journal.page.description": "Kuvaus",
   
   // "journal.page.editor": "Editor-in-Chief",
-  // TODO New key - Add a translation
-  "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Päätoimittaja",
   
   // "journal.page.issn": "ISSN",
-  // TODO New key - Add a translation
-  "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN-tunnus",
   
   // "journal.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Julkaisija",
   
   // "journal.page.titleprefix": "Journal: ",
-  // TODO New key - Add a translation
-  "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Kausijulkaisu: ",
   
   // "journal.search.results.head": "Journal Search Results",
-  // TODO New key - Add a translation
-  "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "Kausijulkaisuhaun tulokset",
   
   // "journal.search.title": "DSpace Angular :: Journal Search",
-  // TODO New key - Add a translation
-  "journal.search.title": "DSpace Angular :: Journal Search",
+  "journal.search.title": "DSpace Angular :: Kausijulkaisuhaku",
   
   
   
   // "journalissue.listelement.badge": "Journal Issue",
-  // TODO New key - Add a translation
-  "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Kausijulkaisun numero",
   
   // "journalissue.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalissue.page.description": "Description",
+  "journalissue.page.description": "Kuvaus",
   
   // "journalissue.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Julkaisuaika",
   
   // "journalissue.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "Kausijulkaisun ISSN-tunnus",
   
   // "journalissue.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Kausijulkaisun nimi",
   
   // "journalissue.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Asiasanat",
   
   // "journalissue.page.number": "Number",
-  // TODO New key - Add a translation
-  "journalissue.page.number": "Number",
+  "journalissue.page.number": "Numero",
   
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  // TODO New key - Add a translation
-  "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Kausijulkaisun numero: ",
   
   
   
   // "journalvolume.listelement.badge": "Journal Volume",
-  // TODO New key - Add a translation
-  "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Kausijulkaisun vuosikerta",
   
   // "journalvolume.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Kuvaus",
   
   // "journalvolume.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Julkaisuaika",
   
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  // TODO New key - Add a translation
-  "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Kausijulkaisun vuosikerta: ",
   
   // "journalvolume.page.volume": "Volume",
-  // TODO New key - Add a translation
-  "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Vuosikerta",
   
   
   
@@ -2755,106 +2357,84 @@
   "loading.bitstreams": "Loading bitstreams...",
   
   // "loading.browse-by": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.browse-by": "Loading items...",
+  "loading.browse-by": "Ladataan tietueita...",
   
   // "loading.browse-by-page": "Loading page...",
-  // TODO New key - Add a translation
-  "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Ladataan sivua...",
   
   // "loading.collection": "Loading collection...",
-  // TODO New key - Add a translation
-  "loading.collection": "Loading collection...",
+  "loading.collection": "Ladataan kokoelmaa...",
   
   // "loading.collections": "Loading collections...",
-  // TODO New key - Add a translation
-  "loading.collections": "Loading collections...",
+  "loading.collections": "Ladataan kokoelmia...",
   
   // "loading.content-source": "Loading content source...",
   // TODO New key - Add a translation
   "loading.content-source": "Loading content source...",
   
   // "loading.community": "Loading community...",
-  // TODO New key - Add a translation
-  "loading.community": "Loading community...",
+  "loading.community": "Ladataan yhteisöä...",
   
   // "loading.default": "Loading...",
-  // TODO New key - Add a translation
-  "loading.default": "Loading...",
+  "loading.default": "Ladataan...",
   
   // "loading.item": "Loading item...",
-  // TODO New key - Add a translation
-  "loading.item": "Loading item...",
+  "loading.item": "Ladataan tietuetta...",
   
   // "loading.items": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.items": "Loading items...",
+  "loading.items": "Ladataan tietueita...",
   
   // "loading.mydspace-results": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Ladataan tietueita...",
   
   // "loading.objects": "Loading...",
-  // TODO New key - Add a translation
-  "loading.objects": "Loading...",
+  "loading.objects": "Ladataan...",
   
   // "loading.recent-submissions": "Loading recent submissions...",
-  // TODO New key - Add a translation
-  "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "Ladataan viimeksi lisättyjä...",
   
   // "loading.search-results": "Loading search results...",
-  // TODO New key - Add a translation
-  "loading.search-results": "Loading search results...",
+  "loading.search-results": "Ladataan hakutuloksia...",
   
   // "loading.sub-collections": "Loading sub-collections...",
-  // TODO New key - Add a translation
-  "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "Ladataan alakokoelmia...",
   
   // "loading.sub-communities": "Loading sub-communities...",
-  // TODO New key - Add a translation
-  "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Ladataan alayhteisöjä...",
   
   // "loading.top-level-communities": "Loading top-level communities...",
-  // TODO New key - Add a translation
-  "loading.top-level-communities": "Loading top-level communities...",
+  "loading.top-level-communities": "Ladataan ylätason yhteisöjä...",
   
   
   
   // "login.form.email": "Email address",
-  // TODO New key - Add a translation
-  "login.form.email": "Email address",
+  "login.form.email": "Sähköpostiosoite",
   
   // "login.form.forgot-password": "Have you forgotten your password?",
-  // TODO New key - Add a translation
-  "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "Unohditko salasanasi?",
   
   // "login.form.header": "Please log in to DSpace",
-  // TODO New key - Add a translation
-  "login.form.header": "Please log in to DSpace",
+  "login.form.header": "Kirjaudu sisään",
   
   // "login.form.new-user": "New user? Click here to register.",
-  // TODO New key - Add a translation
-  "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "Uusi käyttäjä? Rekisteröidy tästä.",
   
   // "login.form.or-divider": "or",
   // TODO New key - Add a translation
   "login.form.or-divider": "or",
   
   // "login.form.password": "Password",
-  // TODO New key - Add a translation
-  "login.form.password": "Password",
+  "login.form.password": "Salasana",
   
   // "login.form.shibboleth": "Log in with Shibboleth",
   // TODO New key - Add a translation
   "login.form.shibboleth": "Log in with Shibboleth",
   
   // "login.form.submit": "Log in",
-  // TODO New key - Add a translation
-  "login.form.submit": "Log in",
+  "login.form.submit": "Kirjaudu sisään",
   
   // "login.title": "Login",
-  // TODO New key - Add a translation
-  "login.title": "Login",
+  "login.title": "Sisäänkirjautuminen",
   
   // "login.breadcrumbs": "Login",
   // TODO New key - Add a translation
@@ -2863,44 +2443,35 @@
   
   
   // "logout.form.header": "Log out from DSpace",
-  // TODO New key - Add a translation
-  "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "Kirjaudu ulos",
   
   // "logout.form.submit": "Log out",
-  // TODO New key - Add a translation
-  "logout.form.submit": "Log out",
+  "logout.form.submit": "Kirjaudu ulos",
   
   // "logout.title": "Logout",
-  // TODO New key - Add a translation
-  "logout.title": "Logout",
+  "logout.title": "Uloskirjautuminen",
   
   
   
   // "menu.header.admin": "Admin",
-  // TODO New key - Add a translation
-  "menu.header.admin": "Admin",
+  "menu.header.admin": "Ylläpitäjä",
   
   // "menu.header.image.logo": "Repository logo",
-  // TODO New key - Add a translation
-  "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "Arkiston logo",
   
   
   
   // "menu.section.access_control": "Access Control",
-  // TODO New key - Add a translation
-  "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Pääsyoikeudet",
   
   // "menu.section.access_control_authorizations": "Authorizations",
-  // TODO New key - Add a translation
-  "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Käyttöoikeudet",
   
   // "menu.section.access_control_groups": "Groups",
-  // TODO New key - Add a translation
-  "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "Ryhmät",
   
   // "menu.section.access_control_people": "People",
-  // TODO New key - Add a translation
-  "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "Käyttäjät",
   
   
   
@@ -2911,546 +2482,420 @@
   
   
   // "menu.section.browse_community": "This Community",
-  // TODO New key - Add a translation
-  "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Tämä yhteisö",
   
   // "menu.section.browse_community_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "Tekijän mukaan",
   
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "Julkaisuajankohdan mukaan",
   
   // "menu.section.browse_community_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "Nimekkeen mukaan",
   
   // "menu.section.browse_global": "All of DSpace",
-  // TODO New key - Add a translation
-  "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Koko julkaisuarkisto",
   
   // "menu.section.browse_global_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Tekijän mukaan",
   
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Julkaisuajankohdan mukaan",
   
   // "menu.section.browse_global_by_subject": "By Subject",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Avainsanan mukaan",
   
   // "menu.section.browse_global_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Nimekkeen mukaan",
   
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections": "Yhteisöt & kokoelmat",
   
   
   
   // "menu.section.control_panel": "Control Panel",
-  // TODO New key - Add a translation
-  "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Hallintapaneeli",
   
   // "menu.section.curation_task": "Curation Task",
-  // TODO New key - Add a translation
-  "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "Kuratointitehtävä",
   
   
   
   // "menu.section.edit": "Edit",
-  // TODO New key - Add a translation
-  "menu.section.edit": "Edit",
+  "menu.section.edit": "Muokkaa",
   
   // "menu.section.edit_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Kokoelma",
   
   // "menu.section.edit_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Yhteisö",
   
   // "menu.section.edit_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.edit_item": "Item",
+  "menu.section.edit_item": "Tietue",
   
   
   
   // "menu.section.export": "Export",
-  // TODO New key - Add a translation
-  "menu.section.export": "Export",
+  "menu.section.export": "Eksportoi",
   
   // "menu.section.export_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Kokoelma",
   
   // "menu.section.export_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.export_community": "Community",
+  "menu.section.export_community": "Yhteisö",
   
   // "menu.section.export_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.export_item": "Item",
+  "menu.section.export_item": "Tietue",
   
   // "menu.section.export_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.export_metadata": "Metadata",
   
   
   
   // "menu.section.icon.access_control": "Access Control menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "Pääsyoikeudet",
   
   // "menu.section.icon.admin_search": "Admin search menu section",
   // TODO New key - Add a translation
   "menu.section.icon.admin_search": "Admin search menu section",
   
   // "menu.section.icon.control_panel": "Control Panel menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Hallintapaneeli",
   
   // "menu.section.icon.curation_task": "Curation Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.curation_task": "Curation Task menu section",
+  "menu.section.icon.curation_task": "Kuratointi",
   
   // "menu.section.icon.edit": "Edit menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Muokkaus",
   
   // "menu.section.icon.export": "Export menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Eksportointi",
   
   // "menu.section.icon.find": "Find menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Haku",
   
   // "menu.section.icon.import": "Import menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "Importointi",
   
   // "menu.section.icon.new": "New menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Uusi",
   
   // "menu.section.icon.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Kiinnitä sivupalkki",
   
   // "menu.section.icon.registries": "Registries menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Rekisterit",
   
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "Tilastot",
   
   // "menu.section.icon.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Vapauta sivupalkki",
   
   
   
   // "menu.section.import": "Import",
-  // TODO New key - Add a translation
-  "menu.section.import": "Import",
+  "menu.section.import": "Importoi",
   
   // "menu.section.import_batch": "Batch Import (ZIP)",
-  // TODO New key - Add a translation
-  "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Importoi useamman tiedoston erä (ZIP)",
   
   // "menu.section.import_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.import_metadata": "Metadata",
   
   
   
   // "menu.section.new": "New",
-  // TODO New key - Add a translation
-  "menu.section.new": "New",
+  "menu.section.new": "Uusi",
   
   // "menu.section.new_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Kokoelma",
   
   // "menu.section.new_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.new_community": "Community",
+  "menu.section.new_community": "Yhteisö",
   
   // "menu.section.new_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.new_item": "Item",
+  "menu.section.new_item": "Tietue",
   
   // "menu.section.new_item_version": "Item Version",
-  // TODO New key - Add a translation
-  "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Tietueen versio",
   
   
   
   // "menu.section.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Kiinnitä sivupalkki",
   
   // "menu.section.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.unpin": "Unpin sidebar",
+  "menu.section.unpin": "Vapauta sivupalkki",
   
   
   
   // "menu.section.registries": "Registries",
-  // TODO New key - Add a translation
-  "menu.section.registries": "Registries",
+  "menu.section.registries": "Rekisterit",
   
   // "menu.section.registries_format": "Format",
-  // TODO New key - Add a translation
-  "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Formaatti",
   
   // "menu.section.registries_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.registries_metadata": "Metadata",
   
   
   
   // "menu.section.statistics": "Statistics",
-  // TODO New key - Add a translation
-  "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "Tilastot",
   
   // "menu.section.statistics_task": "Statistics Task",
-  // TODO New key - Add a translation
-  "menu.section.statistics_task": "Statistics Task",
+  "menu.section.statistics_task": "Tilastointitehtävä",
   
   
   
   // "menu.section.toggle.access_control": "Toggle Access Control section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "Vaihda Pääsyoikeudet-osion tilaa",
   
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Vaihda Hallintapaneeli-osion tilaa",
   
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "Vaihda Kuratointitehtävä-osion tilaa",
   
   // "menu.section.toggle.edit": "Toggle Edit section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Vaihda Muokkaus-osion tilaa",
   
   // "menu.section.toggle.export": "Toggle Export section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Vaihda Eksportointi-osion tilaa",
   
   // "menu.section.toggle.find": "Toggle Find section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Vaihda Haku-osion tilaa",
   
   // "menu.section.toggle.import": "Toggle Import section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "Vaihda Importointi-osion tilaa",
   
   // "menu.section.toggle.new": "Toggle New section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Vaihda Uusi-osion tilaa",
   
   // "menu.section.toggle.registries": "Toggle Registries section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Vaihda Rekisterit-osion tilaa",
   
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
+  "menu.section.toggle.statistics_task": "Vaihda Tilastointitehtävä-osion tilaa",
   
   
   
   // "mydspace.description": "",
-  // TODO New key - Add a translation
   "mydspace.description": "",
   
   // "mydspace.general.text-here": "HERE",
-  // TODO New key - Add a translation
-  "mydspace.general.text-here": "HERE",
+  "mydspace.general.text-here": "TÄSSÄ",
   
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  // TODO New key - Add a translation
-  "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "Valitse tämä, jos haluat lähettää viestin tietueen julkaisijalle.",
   
   // "mydspace.messages.description-placeholder": "Insert your message here...",
-  // TODO New key - Add a translation
-  "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "Kirjoita viestisi tähän...",
   
   // "mydspace.messages.hide-msg": "Hide message",
-  // TODO New key - Add a translation
-  "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Piilota viesti",
   
   // "mydspace.messages.mark-as-read": "Mark as read",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Merkitse luetuksi",
   
   // "mydspace.messages.mark-as-unread": "Mark as unread",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "Merkitse lukemattomaksi",
   
   // "mydspace.messages.no-content": "No content.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "Ei sisältöä.",
   
   // "mydspace.messages.no-messages": "No messages yet.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Ei viestejä.",
   
   // "mydspace.messages.send-btn": "Send",
-  // TODO New key - Add a translation
-  "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Lähetä",
   
   // "mydspace.messages.show-msg": "Show message",
-  // TODO New key - Add a translation
-  "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Näytä viesti",
   
   // "mydspace.messages.subject-placeholder": "Subject...",
-  // TODO New key - Add a translation
-  "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Asiasana...",
   
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-  // TODO New key - Add a translation
-  "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Valitse tämä, jos haluat lähettää viestin tarkastajalle.",
   
   // "mydspace.messages.title": "Messages",
-  // TODO New key - Add a translation
-  "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Viestit",
   
   // "mydspace.messages.to": "To",
-  // TODO New key - Add a translation
-  "mydspace.messages.to": "To",
+  "mydspace.messages.to": "Vastaanottaja",
   
   // "mydspace.new-submission": "New submission",
-  // TODO New key - Add a translation
-  "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Uusi julkaisu",
   
   // "mydspace.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "Julkaisusi",
   
   // "mydspace.results.no-abstract": "No Abstract",
-  // TODO New key - Add a translation
-  "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Ei tiivistelmää",
   
   // "mydspace.results.no-authors": "No Authors",
-  // TODO New key - Add a translation
-  "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Ei tekijöitä",
   
   // "mydspace.results.no-collections": "No Collections",
-  // TODO New key - Add a translation
-  "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "Ei kokoelmia",
   
   // "mydspace.results.no-date": "No Date",
-  // TODO New key - Add a translation
-  "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Ei päivämäärää",
   
   // "mydspace.results.no-files": "No Files",
-  // TODO New key - Add a translation
-  "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Ei tiedostoja",
   
   // "mydspace.results.no-results": "There were no items to show",
-  // TODO New key - Add a translation
-  "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "Ei tietueita",
   
   // "mydspace.results.no-title": "No title",
-  // TODO New key - Add a translation
-  "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Ei nimikettä",
   
   // "mydspace.results.no-uri": "No Uri",
-  // TODO New key - Add a translation
-  "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "Ei URL-osoitetta",
   
   // "mydspace.show.workflow": "All tasks",
-  // TODO New key - Add a translation
-  "mydspace.show.workflow": "All tasks",
+  "mydspace.show.workflow": "Kaikki tehtävät",
   
   // "mydspace.show.workspace": "Your Submissions",
-  // TODO New key - Add a translation
-  "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Julkaisusi",
   
   // "mydspace.status.archived": "Archived",
-  // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  "mydspace.status.archived": "Arkistoitu",
   
   // "mydspace.status.validation": "Validation",
-  // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.validation": "Tarkastaminen",
   
   // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.waiting-for-controller": "Odotetaan tarkastajaa",
   
   // "mydspace.status.workflow": "Workflow",
-  // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.workflow": "Työnkulku",
   
   // "mydspace.status.workspace": "Workspace",
-  // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.workspace": "Työtila",
   
   // "mydspace.title": "MyDSpace",
-  // TODO New key - Add a translation
-  "mydspace.title": "MyDSpace",
+  "mydspace.title": "Omat tiedot",
   
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "Virhe uutta työtilaa luotaessa. Tarkista ladattava sisältö ennen kuin yrität uudelleen.",
   
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} uutta työtilaa luotu.",
   
   // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-successful": "Uusi työtila luotu. Napauta tästä muokataksesi sitä.",
   
   // "mydspace.view-btn": "View",
-  // TODO New key - Add a translation
-  "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Näytä",
   
   
   
   // "nav.browse.header": "All of DSpace",
-  // TODO New key - Add a translation
-  "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "Koko julkaisuarkisto",
   
   // "nav.community-browse.header": "By Community",
-  // TODO New key - Add a translation
-  "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "Yhteisön mukaan",
   
   // "nav.language": "Language switch",
-  // TODO New key - Add a translation
-  "nav.language": "Language switch",
+  "nav.language": "Kielivalinta",
   
   // "nav.login": "Log In",
-  // TODO New key - Add a translation
-  "nav.login": "Log In",
+  "nav.login": "Kirjaudu sisään",
   
   // "nav.logout": "Log Out",
-  // TODO New key - Add a translation
-  "nav.logout": "Log Out",
+  "nav.logout": "Kirjaudu ulos",
   
   // "nav.mydspace": "MyDSpace",
-  // TODO New key - Add a translation
-  "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "Omat tiedot",
   
   // "nav.profile": "Profile",
   // TODO New key - Add a translation
   "nav.profile": "Profile",
   
   // "nav.search": "Search",
-  // TODO New key - Add a translation
-  "nav.search": "Search",
+  "nav.search": "Hae",
   
   // "nav.statistics.header": "Statistics",
-  // TODO New key - Add a translation
-  "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "Tilastot",
   
   
   
   // "orgunit.listelement.badge": "Organizational Unit",
-  // TODO New key - Add a translation
-  "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Organisaatioyksikkö",
   
   // "orgunit.page.city": "City",
-  // TODO New key - Add a translation
-  "orgunit.page.city": "City",
+  "orgunit.page.city": "Kaupunki",
   
   // "orgunit.page.country": "Country",
-  // TODO New key - Add a translation
-  "orgunit.page.country": "Country",
+  "orgunit.page.country": "Maa",
   
   // "orgunit.page.dateestablished": "Date established",
-  // TODO New key - Add a translation
-  "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Perustamispäivämäärä",
   
   // "orgunit.page.description": "Description",
-  // TODO New key - Add a translation
-  "orgunit.page.description": "Description",
+  "orgunit.page.description": "Kuvaus",
   
   // "orgunit.page.id": "ID",
-  // TODO New key - Add a translation
-  "orgunit.page.id": "ID",
+  "orgunit.page.id": "ID-tunnus",
   
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Organisaatioyksikkö: ",
   
   
   
   // "pagination.results-per-page": "Results Per Page",
-  // TODO New key - Add a translation
-  "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "Tuloksia sivulla",
   
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
-  // TODO New key - Add a translation
-  "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} / {{ total }}",
   
   // "pagination.showing.label": "Now showing ",
-  // TODO New key - Add a translation
-  "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "Näytetään ",
   
   // "pagination.sort-direction": "Sort Options",
-  // TODO New key - Add a translation
-  "pagination.sort-direction": "Sort Options",
+  "pagination.sort-direction": "Lajitteluvalinnat",
   
   
   
   // "person.listelement.badge": "Person",
-  // TODO New key - Add a translation
-  "person.listelement.badge": "Person",
+  "person.listelement.badge": "Käyttäjä",
   
   // "person.page.birthdate": "Birth Date",
-  // TODO New key - Add a translation
-  "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Syntymäaika",
   
   // "person.page.email": "Email Address",
-  // TODO New key - Add a translation
-  "person.page.email": "Email Address",
+  "person.page.email": "Sähköpostiosoite",
   
   // "person.page.firstname": "First Name",
-  // TODO New key - Add a translation
-  "person.page.firstname": "First Name",
+  "person.page.firstname": "Etunimi",
   
   // "person.page.jobtitle": "Job Title",
-  // TODO New key - Add a translation
-  "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "Tehtävänimike",
   
   // "person.page.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "person.page.lastname": "Last Name",
+  "person.page.lastname": "Sukunimi",
   
   // "person.page.link.full": "Show all metadata",
-  // TODO New key - Add a translation
-  "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Näytä kaikki metadata",
   
   // "person.page.orcid": "ORCID",
-  // TODO New key - Add a translation
-  "person.page.orcid": "ORCID",
+  "person.page.orcid": "ORCID-tunniste",
   
   // "person.page.staffid": "Staff ID",
-  // TODO New key - Add a translation
-  "person.page.staffid": "Staff ID",
+  "person.page.staffid": "Henkilökunnan ID-tunnus",
   
   // "person.page.titleprefix": "Person: ",
-  // TODO New key - Add a translation
-  "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Käyttäjä: ",
   
   // "person.search.results.head": "Person Search Results",
-  // TODO New key - Add a translation
-  "person.search.results.head": "Person Search Results",
+  "person.search.results.head": "Käyttäjähaun tulokset",
   
   // "person.search.title": "DSpace Angular :: Person Search",
-  // TODO New key - Add a translation
-  "person.search.title": "DSpace Angular :: Person Search",
+  "person.search.title": "DSpace Angular :: Käyttäjähaku",
   
   
   
@@ -3569,40 +3014,31 @@
   
   
   // "project.listelement.badge": "Research Project",
-  // TODO New key - Add a translation
-  "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Tutkimusprojekti",
   
   // "project.page.contributor": "Contributors",
-  // TODO New key - Add a translation
-  "project.page.contributor": "Contributors",
+  "project.page.contributor": "Muut tekijät",
   
   // "project.page.description": "Description",
-  // TODO New key - Add a translation
-  "project.page.description": "Description",
+  "project.page.description": "Kuvaus",
   
   // "project.page.expectedcompletion": "Expected Completion",
-  // TODO New key - Add a translation
-  "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Todennäköinen päättyminen",
   
   // "project.page.funder": "Funders",
-  // TODO New key - Add a translation
-  "project.page.funder": "Funders",
+  "project.page.funder": "Rahoittajat",
   
   // "project.page.id": "ID",
-  // TODO New key - Add a translation
-  "project.page.id": "ID",
+  "project.page.id": "ID-tunnus",
   
   // "project.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "project.page.keyword": "Keywords",
+  "project.page.keyword": "Asiasanat",
   
   // "project.page.status": "Status",
-  // TODO New key - Add a translation
-  "project.page.status": "Status",
+  "project.page.status": "Tila",
   
   // "project.page.titleprefix": "Research Project: ",
-  // TODO New key - Add a translation
-  "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Tutkimusprojekti: ",
   
   // "project.search.results.head": "Project Search Results",
   // TODO New key - Add a translation
@@ -3611,90 +3047,69 @@
   
   
   // "publication.listelement.badge": "Publication",
-  // TODO New key - Add a translation
-  "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Julkaisu",
   
   // "publication.page.description": "Description",
-  // TODO New key - Add a translation
-  "publication.page.description": "Description",
+  "publication.page.description": "Kuvaus",
   
   // "publication.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "Kausijulkaisun ISSN-tunnus",
   
   // "publication.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Kausijulkaisun nimi",
   
   // "publication.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Julkaisija",
   
   // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Julkaisu: ",
   
   // "publication.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "Vuosikerran nimi",
   
   // "publication.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "Aineistohaun tulokset",
   
   // "publication.search.title": "DSpace Angular :: Publication Search",
-  // TODO New key - Add a translation
-  "publication.search.title": "DSpace Angular :: Publication Search",
+  "publication.search.title": "DSpace Angular :: Aineistohaku",
   
   
   
   // "relationships.isAuthorOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Tekijät",
   
   // "relationships.isIssueOf": "Journal Issues",
-  // TODO New key - Add a translation
-  "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Kausijulkaisun numerot",
   
   // "relationships.isJournalIssueOf": "Journal Issue",
-  // TODO New key - Add a translation
-  "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Kausijulkaisun numero",
   
   // "relationships.isJournalOf": "Journals",
-  // TODO New key - Add a translation
-  "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Kausijulkaisut",
   
   // "relationships.isOrgUnitOf": "Organizational Units",
-  // TODO New key - Add a translation
-  "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Organisaatioyksiköt",
   
   // "relationships.isPersonOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Tekijät",
   
   // "relationships.isProjectOf": "Research Projects",
-  // TODO New key - Add a translation
-  "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Tutkimusprojektit",
   
   // "relationships.isPublicationOf": "Publications",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Julkaisut",
   
   // "relationships.isPublicationOfJournalIssue": "Articles",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Artikkelit",
   
   // "relationships.isSingleJournalOf": "Journal",
-  // TODO New key - Add a translation
-  "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "Kausijulkaisu",
   
   // "relationships.isSingleVolumeOf": "Journal Volume",
-  // TODO New key - Add a translation
-  "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Kausijulkaisun vuosikerta",
   
   // "relationships.isVolumeOf": "Journal Volumes",
-  // TODO New key - Add a translation
-  "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Kausijulkaisun vuosikerrat",
   
   // "relationships.isContributorOf": "Contributors",
   // TODO New key - Add a translation
@@ -3703,16 +3118,13 @@
   
   
   // "search.description": "",
-  // TODO New key - Add a translation
   "search.description": "",
   
   // "search.switch-configuration.title": "Show",
-  // TODO New key - Add a translation
-  "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Näytä",
   
   // "search.title": "DSpace Angular :: Search",
-  // TODO New key - Add a translation
-  "search.title": "DSpace Angular :: Search",
+  "search.title": "DSpace Angular :: Hae",
   
   // "search.breadcrumbs": "Search",
   // TODO New key - Add a translation
@@ -3720,48 +3132,38 @@
   
   
   // "search.filters.applied.f.author": "Author",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author": "Tekijä",
   
   // "search.filters.applied.f.dateIssued.max": "End date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max": "Loppupäivämäärä",
   
   // "search.filters.applied.f.dateIssued.min": "Start date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "Alkupäivämäärä",
   
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Tallennusajankohta",
   
   // "search.filters.applied.f.discoverable": "Private",
   // TODO New key - Add a translation
   "search.filters.applied.f.discoverable": "Private",
   
   // "search.filters.applied.f.entityType": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Tietueen tyyppi",
   
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle": "Tiedostot:",
   
   // "search.filters.applied.f.itemtype": "Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "Tyyppi",
   
   // "search.filters.applied.f.namedresourcetype": "Status",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "Tila",
   
   // "search.filters.applied.f.subject": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "Asiasana",
   
   // "search.filters.applied.f.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Julkaisija",
   
   // "search.filters.applied.f.jobTitle": "Job Title",
   // TODO New key - Add a translation
@@ -3782,72 +3184,55 @@
   
   
   // "search.filters.filter.author.head": "Author",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "Tekijä",
   
   // "search.filters.filter.author.placeholder": "Author name",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "Tekijän nimi",
   
   // "search.filters.filter.birthDate.head": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Syntymäaika",
   
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Syntymäaika",
   
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Julkaisuajankohta",
   
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Julkaisuajankohta",
   
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "Toimittaja",
   
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Toimittaja",
   
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Asiasana",
   
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Asiasana",
   
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Julkaisija",
   
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Julkaisija",
   
   // "search.filters.filter.dateIssued.head": "Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "Päivämäärä",
   
   // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Alkupäivämäärä",
   
   // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Loppupäivämäärä",
   
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Tallennusajankohta",
   
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Tallennnusajankohta",
   
   // "search.filters.filter.discoverable.head": "Private",
   // TODO New key - Add a translation
@@ -3858,112 +3243,85 @@
   "search.filters.filter.withdrawn.head": "Withdrawn",
   
   // "search.filters.filter.entityType.head": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Tietueen tyyppi",
   
   // "search.filters.filter.entityType.placeholder": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Tietueen tyyppi",
   
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-  // TODO New key - Add a translation
-  "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head": "Tiedostot:",
   
   // "search.filters.filter.itemtype.head": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "Tyyppi",
   
   // "search.filters.filter.itemtype.placeholder": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Tyyppi",
   
   // "search.filters.filter.jobTitle.head": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "Tehtävänimike",
   
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "Tehtävänimike",
   
   // "search.filters.filter.knowsLanguage.head": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Tunnettu kieli",
   
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Tunnettu kieli",
   
   // "search.filters.filter.namedresourcetype.head": "Status",
-  // TODO New key - Add a translation
-  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Tila",
   
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  // TODO New key - Add a translation
-  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Tila",
   
   // "search.filters.filter.objectpeople.head": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "Käyttäjät",
   
   // "search.filters.filter.objectpeople.placeholder": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "Käyttäjät",
   
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "Maa",
   
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Maa",
   
   // "search.filters.filter.organizationAddressLocality.head": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Kaupunki",
   
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Kaupunki",
   
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Perustamispäivämäärä",
   
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Perustamispäivämäärä",
   
   // "search.filters.filter.scope.head": "Scope",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "Rajaus",
   
   // "search.filters.filter.scope.placeholder": "Scope filter",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "Haun tarkennus",
   
   // "search.filters.filter.show-less": "Collapse",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "Sulje",
   
   // "search.filters.filter.show-more": "Show more",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "Näytä lisää",
   
   // "search.filters.filter.subject.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "Aihe",
   
   // "search.filters.filter.subject.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "Aihe",
   
   // "search.filters.filter.submitter.head": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Julkaisija",
   
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Julkaisija",
   
   
   
@@ -4005,40 +3363,32 @@
   
   
   // "search.filters.head": "Filters",
-  // TODO New key - Add a translation
-  "search.filters.head": "Filters",
+  "search.filters.head": "Suodattimet",
   
   // "search.filters.reset": "Reset filters",
-  // TODO New key - Add a translation
-  "search.filters.reset": "Reset filters",
+  "search.filters.reset": "Tyhjennä suodattimet",
   
   
   
   // "search.form.search": "Search",
-  // TODO New key - Add a translation
-  "search.form.search": "Search",
+  "search.form.search": "Hae",
   
   // "search.form.search_dspace": "Search DSpace",
-  // TODO New key - Add a translation
-  "search.form.search_dspace": "Search DSpace",
+  "search.form.search_dspace": "Hae arkistosta",
   
   // "search.form.search_mydspace": "Search MyDSpace",
-  // TODO New key - Add a translation
-  "search.form.search_mydspace": "Search MyDSpace",
+  "search.form.search_mydspace": "Hae omista tiedoista",
   
   
   
   // "search.results.head": "Search Results",
-  // TODO New key - Add a translation
-  "search.results.head": "Search Results",
+  "search.results.head": "Hakutulokset",
   
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  // TODO New key - Add a translation
-  "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "Ei tuloksia. Jos sinulla on hakuongelmia, voit",
   
   // "search.results.no-results-link": "quotes around it",
-  // TODO New key - Add a translation
-  "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "käyttää lainausmerkkejä",
   
   // "search.results.empty": "Your search returned no results.",
   // TODO New key - Add a translation
@@ -4047,102 +3397,79 @@
   
   
   // "search.sidebar.close": "Back to results",
-  // TODO New key - Add a translation
-  "search.sidebar.close": "Back to results",
+  "search.sidebar.close": "Palaa tuloksiin",
   
   // "search.sidebar.filters.title": "Filters",
-  // TODO New key - Add a translation
-  "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "Suodattimet",
   
   // "search.sidebar.open": "Search Tools",
-  // TODO New key - Add a translation
-  "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "Hakutyökalut",
   
   // "search.sidebar.results": "results",
-  // TODO New key - Add a translation
-  "search.sidebar.results": "results",
+  "search.sidebar.results": "tulokset",
   
   // "search.sidebar.settings.rpp": "Results per page",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "Tulosta sivulla",
   
   // "search.sidebar.settings.sort-by": "Sort By",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "Järjestä",
   
   // "search.sidebar.settings.title": "Settings",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "Asetukset",
   
   
   
   // "search.view-switch.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Näytä lisätiedot",
   
   // "search.view-switch.show-grid": "Show as grid",
-  // TODO New key - Add a translation
-  "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "Näydä ruudukkona",
   
   // "search.view-switch.show-list": "Show as list",
-  // TODO New key - Add a translation
-  "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "Näytä listana",
   
   
   
   // "sorting.dc.title.ASC": "Title Ascending",
-  // TODO New key - Add a translation
-  "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "Nimeke (A-Ö)",
   
   // "sorting.dc.title.DESC": "Title Descending",
-  // TODO New key - Add a translation
-  "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "Nimeke (Ö-A)",
   
   // "sorting.score.DESC": "Relevance",
-  // TODO New key - Add a translation
-  "sorting.score.DESC": "Relevance",
+  "sorting.score.DESC": "Relevanssi",
   
   
   
   // "submission.edit.title": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Muokkaa julkaisua",
   
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  // TODO New key - Add a translation
-  "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  "submission.general.cannot_submit": "Sinulla ei ole oikeuksia aineiston julkaisemiseen.",
   
   // "submission.general.deposit": "Deposit",
-  // TODO New key - Add a translation
-  "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Tallenna",
   
   // "submission.general.discard.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "Peruuta",
   
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "Tätä operaatiota ei voi perua. Oletko varma?",
   
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Kyllä, olen varma",
   
   // "submission.general.discard.confirm.title": "Discard submission",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Hylkää julkaisu",
   
   // "submission.general.discard.submit": "Discard",
-  // TODO New key - Add a translation
-  "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "Hylkää",
   
   // "submission.general.save": "Save",
-  // TODO New key - Add a translation
-  "submission.general.save": "Save",
+  "submission.general.save": "Tallenna",
   
   // "submission.general.save-later": "Save for later",
-  // TODO New key - Add a translation
-  "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "Tallenna myöhemmäksi",
   
   
   
@@ -4210,9 +3537,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -4322,9 +3649,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -4402,9 +3729,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
@@ -4423,312 +3750,242 @@
   "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
   
   // "submission.sections.general.add-more": "Add more",
-  // TODO New key - Add a translation
-  "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "Lisää enemmän",
   
   // "submission.sections.general.collection": "Collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "Kokoelma",
   
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "Ongelma tietueen julkaisemisessa, yritä myöhemmin uudelleen.",
   
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "Julkaisu tallennettu.",
   
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "Ongelma tietueen hylkäämisessä, yritä myöhemmin uudelleen.",
   
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "Julkaisu hylätty.",
   
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "Uusi metadata poimittu ja lisätty <strong>{{sectionId}}</strong>-osioon.",
   
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "Uusi <strong>{{sectionId}}</strong>-osio lisätty julkaisuun.",
   
   // "submission.sections.general.no-collection": "No collection found",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "Ei kokoelmia",
   
   // "submission.sections.general.no-sections": "No options available",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "Ei vaihtoehtoja",
   
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "Ongelma tietueen tallentamisessa, yritä myöhemmin uudelleen.",
   
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "Julkaisun tallennus onnistui.",
   
   // "submission.sections.general.search-collection": "Search for a collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Hae kokoelmaa",
   
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  // TODO New key - Add a translation
-  "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Tallennuksessa keskeneräisiä osioita.",
   
   
   
   // "submission.sections.submit.progressbar.cclicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.cclicense": "Creative commons license",
+  "submission.sections.submit.progressbar.cclicense": "Creative commons -lisenssi",
   
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Kierrätä",
   
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Kuvaile",
   
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Kuvaile",
   
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "Kuvaile",
   
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.detect-duplicate": "Mahdollisia kaksoiskappaleita",
   
   // "submission.sections.submit.progressbar.license": "Deposit license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "Tallennuslisenssi",
   
   // "submission.sections.submit.progressbar.upload": "Upload files",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "Lataa tiedostoja",
   
   
   
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "Peruuta",
   
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "Tätä toimintoa ei voi peruuttaa. Oletko varma?",
   
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Kyllä, olen varma",
   
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Poista tiedosto",
   
   // "submission.sections.upload.delete.submit": "Delete",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Poista",
   
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  // TODO New key - Add a translation
-  "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Pudota tiedostot liittääksesi ne tietueeseen",
   
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Pääsyoikeustyyppi",
   
   // "submission.sections.upload.form.date-required": "Date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Päivämäärä on pakollinen tieto.",
   
   // "submission.sections.upload.form.from-label": "Access grant from",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-label": "Access grant from",
+  "submission.sections.upload.form.from-label": "Pääsyoikeus alkaa",
   
   // "submission.sections.upload.form.from-placeholder": "From",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "Lähettäjä",
   
   // "submission.sections.upload.form.group-label": "Group",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Ryhmä",
   
   // "submission.sections.upload.form.group-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Ryhmä on pakollinen tieto.",
   
   // "submission.sections.upload.form.until-label": "Access grant until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-label": "Access grant until",
+  "submission.sections.upload.form.until-label": "Pääsyoikeus päättyy",
   
   // "submission.sections.upload.form.until-placeholder": "Until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "Asti",
   
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "{{collectionName}}-kokoelmaan ladatut tiedostot ovat seuraavien ryhmien saatavilla:",
   
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "Yksittäisten tiedostojen pääsyrajoitusten lisäksi {{collectionName}}-kokoelmaan ladatut tiedostot ovat seuraavien ryhmien saatavilla:",
   
   // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
-  // TODO New key - Add a translation
-  "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
+  "submission.sections.upload.info": "Tietueen kaikki tiedostot on listattu tässä. Voit päivittää tiedoston metadataa ja pääsyehtoja tai <strong>ladata lisää tiedostoja raahaamalla ne mihin hyvänsä sivun kohtaan</strong>",
   
   // "submission.sections.upload.no-entry": "No",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "Ei",
   
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Tiedostoa ei vielä ladattu.",
   
   // "submission.sections.upload.save-metadata": "Save metadata",
-  // TODO New key - Add a translation
-  "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Tallenna metadata",
   
   // "submission.sections.upload.undo": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "Peruuta",
   
   // "submission.sections.upload.upload-failed": "Upload failed",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "Lataus epäonnistui",
   
   // "submission.sections.upload.upload-successful": "Upload successful",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "Lataus valmis",
   
   
   
   // "submission.submit.title": "Submission",
-  // TODO New key - Add a translation
-  "submission.submit.title": "Submission",
+  "submission.submit.title": "Julkaisu",
   
   
   
   // "submission.workflow.generic.delete": "Delete",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "Poista",
   
   // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
   // TODO New key - Add a translation
   "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
   
   // "submission.workflow.generic.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "Muokkaa",
   
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Valitse tämä muuttaaksesi tietueen metadataa.",
   
   // "submission.workflow.generic.view": "View",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Näytä",
   
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Valitse tämä katsoaksesi tietueen metadataa.",
   
   
   
   // "submission.workflow.tasks.claimed.approve": "Approve",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "Hyväksy",
   
   // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
   
   // "submission.workflow.tasks.claimed.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "Muokkaa",
   
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "Valitse tämä muuttaaksesi tietueen metadataa.",
   
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Syötä kenttään syy julkaisun hylkäämiselle. Kerro myös, voiko julkaisija korjata ongelman ja lähettää aineiston uudelleen.",
   
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Kuvaa hylkäyksen syy",
   
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Hylkää tietue",
   
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Syy",
   
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "Hylkää",
   
   // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
   
   // "submission.workflow.tasks.claimed.return": "Return to pool",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "Palauta tehtäväjonoon",
   
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
+  "submission.workflow.tasks.claimed.return_help": "Palauta tehtävä tehtäväjonoon, jotta toinen käyttäjä voi suorittaa sen.",
   
   
   
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "Virhe toimintoa suoritettaessa...",
   
   // "submission.workflow.tasks.generic.processing": "Processing...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "Käsitellään...",
   
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Julkaisija",
   
   // "submission.workflow.tasks.generic.success": "Operation successful",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "Toiminto onnistui",
   
   
   
   // "submission.workflow.tasks.pool.claim": "Claim",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Ota itsellesi",
   
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "Ota tehtävä itsellesi.",
   
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "Piilota lisätiedot",
   
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Näytä lisätiedot",
   
   
   
   // "title": "DSpace",
-  // TODO New key - Add a translation
-  "title": "DSpace",
+  "title": "Julkaisuarkisto",
   
   
   // "administrativeView.search.results.head": "Administrative Search",
@@ -4742,24 +3999,19 @@
   
   
   // "uploader.browse": "browse",
-  // TODO New key - Add a translation
-  "uploader.browse": "browse",
+  "uploader.browse": "selaa",
   
   // "uploader.drag-message": "Drag & Drop your files here",
-  // TODO New key - Add a translation
-  "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Raahaa tiedostot tähän",
   
   // "uploader.or": ", or",
-  // TODO New key - Add a translation
-  "uploader.or": ", or",
+  "uploader.or": ", tai",
   
   // "uploader.processing": "Processing",
-  // TODO New key - Add a translation
-  "uploader.processing": "Processing",
+  "uploader.processing": "Käsitellään",
   
   // "uploader.queue-length": "Queue length",
-  // TODO New key - Add a translation
-  "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "Jonon pituus",
   
   // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
   // TODO New key - Add a translation
@@ -4775,4 +4027,4 @@
   
   
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 24d0726a686..28436e0eb9c 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -3541,9 +3541,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -3653,9 +3653,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -3733,9 +3733,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5
index d7afa97f085..a2a7042d335 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -4210,9 +4210,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -4322,9 +4322,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -4402,9 +4402,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index 4ad07d7ae9b..b88db9d93ac 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -3340,8 +3340,8 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importē no LC Nosaukuma",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importē no ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importē no ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importē no Sherpa Žurnāla",
@@ -3424,8 +3424,8 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Izdevēji ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Nosaukumi ({{ count }})",
@@ -3484,8 +3484,8 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Meklēšanas rezultāti",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Meklēšanas rezultāti",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Meklēšanas rezultāti",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Meklēšanas rezultāti",
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index 4fd9f444e66..2959bccef96 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -3536,9 +3536,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -3648,9 +3648,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -3728,9 +3728,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index d7afa97f085..a2a7042d335 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -4210,9 +4210,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -4322,9 +4322,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -4402,9 +4402,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/pt.json5 b/src/assets/i18n/pt.json5
index da71ddec110..1ebcbd06065 100644
--- a/src/assets/i18n/pt.json5
+++ b/src/assets/i18n/pt.json5
@@ -3536,9 +3536,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -3648,9 +3648,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -3728,9 +3728,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index d7afa97f085..a2a7042d335 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -4210,9 +4210,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -4322,9 +4322,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -4402,9 +4402,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index d7afa97f085..a2a7042d335 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -4210,9 +4210,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
   
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcidV2": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   // TODO New key - Add a translation
@@ -4322,9 +4322,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
   // TODO New key - Add a translation
@@ -4402,9 +4402,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   // TODO New key - Add a translation
diff --git a/src/config/global-config.interface.ts b/src/config/global-config.interface.ts
index acef3404eb7..0bc3d5eec4b 100644
--- a/src/config/global-config.interface.ts
+++ b/src/config/global-config.interface.ts
@@ -11,9 +11,10 @@ import { ItemPageConfig } from './item-page-config.interface';
 import { CollectionPageConfig } from './collection-page-config.interface';
 import { Theme } from './theme.inferface';
 import {AuthConfig} from './auth-config.interfaces';
+import { UIServerConfig } from './ui-server-config.interface';
 
 export interface GlobalConfig extends Config {
-  ui: ServerConfig;
+  ui: UIServerConfig;
   rest: ServerConfig;
   production: boolean;
   cache: CacheConfig;
@@ -31,4 +32,5 @@ export interface GlobalConfig extends Config {
   item: ItemPageConfig;
   collection: CollectionPageConfig;
   theme: Theme;
+  rewriteDownloadUrls: boolean;
 }
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
new file mode 100644
index 00000000000..93f90c345cd
--- /dev/null
+++ b/src/config/ui-server-config.interface.ts
@@ -0,0 +1,14 @@
+import { ServerConfig } from './server-config.interface';
+
+/**
+ * Server configuration related to the UI.
+ */
+export class UIServerConfig extends ServerConfig {
+
+  // rateLimiter is used to limit the amount of requests a user is allowed make in an amount of time, in order to prevent overloading the server
+  rateLimiter?: {
+    windowMs: number;
+    max: number;
+  };
+
+}
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 9dcac653634..80b383a8019 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -6,20 +6,27 @@ import { RestRequestMethod } from '../app/core/data/rest-request-method';
 export const environment: GlobalConfig = {
   production: true,
   // Angular Universal server settings.
+  // NOTE: these must be "synced" with the 'dspace.ui.url' setting in your backend's local.cfg.
   ui: {
     ssl: false,
     host: 'localhost',
     port: 4000,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/',
+    // The rateLimiter settings limit each IP to a "max" of 500 requests per "windowMs" (1 minute).
+    rateLimiter: {
+      windowMs: 1 * 60 * 1000,   // 1 minute
+      max: 500 // limit each IP to 500 requests per windowMs
+    }
   },
   // The REST API server settings.
+  // NOTE: these must be "synced" with the 'dspace.server.url' setting in your backend's local.cfg.
   rest: {
     ssl: true,
     host: 'dspace7.4science.cloud',
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api',
+    nameSpace: '/server',
   },
   // Caching settings
   cache: {
@@ -58,9 +65,9 @@ export const environment: GlobalConfig = {
   submission: {
     autosave: {
       // NOTE: which metadata trigger an autosave
-      metadata: ['dc.title', 'dc.identifier.doi', 'dc.identifier.pmid', 'dc.identifier.arxiv'],
+      metadata: [],
       // NOTE: every how many minutes submission is saved automatically
-      timer: 5
+      timer: 0
     },
     icons: {
       metadata: [
@@ -160,6 +167,10 @@ export const environment: GlobalConfig = {
     code: 'lv',
     label: 'Latviešu',
     active: true,
+  },{
+    code: 'fi',
+    label: 'Suomi',
+    active: true,
   }],
   // Browse-By Pages
   browseBy: {
@@ -208,5 +219,7 @@ export const environment: GlobalConfig = {
   },
   theme: {
     name: 'default',
-  }
+  },
+  // Whether the UI should rewrite file download URLs to match its domain. Only necessary to enable when running UI and REST API on separate domains
+  rewriteDownloadUrls: false,
 };
diff --git a/src/environments/environment.template.ts b/src/environments/environment.template.ts
index d0282ad6077..6f6510e1abb 100644
--- a/src/environments/environment.template.ts
+++ b/src/environments/environment.template.ts
@@ -4,7 +4,7 @@ export const environment = {
    * e.g.
    * rest: {
    *   host: 'rest.api',
-   *   nameSpace: '/rest/api',
+   *   nameSpace: '/rest',
    * }
    */
 };
diff --git a/src/environments/mock-environment.ts b/src/environments/mock-environment.ts
index 7bf6d6c8464..b220c460836 100644
--- a/src/environments/mock-environment.ts
+++ b/src/environments/mock-environment.ts
@@ -19,6 +19,7 @@ export const environment: Partial<GlobalConfig> = {
     port: 80,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/angular-dspace',
+    rateLimiter: undefined
   },
     // Caching settings
   cache: {
@@ -195,5 +196,5 @@ export const environment: Partial<GlobalConfig> = {
   },
   theme: {
     name: 'default',
-  }
+  },
 };
diff --git a/src/main.browser.ts b/src/main.browser.ts
index 783f6d7d064..5149014d88e 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -50,3 +50,5 @@ if (hasValue(environment.universal) && environment.universal.preboot === false)
 } else {
   document.addEventListener('DOMContentLoaded', () => bootloader(main));
 }
+
+import 'zone.js/dist/zone';
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index f43074e0339..295e78b932e 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -21,6 +21,13 @@ import { AuthService } from '../../app/core/auth/auth.service';
 import { Angulartics2RouterlessModule } from 'angulartics2/routerlessmodule';
 import { SubmissionService } from '../../app/submission/submission.service';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
+import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
+import { KlaroService } from '../../app/shared/cookies/klaro.service';
+import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
+import {
+  BrowserHardRedirectService,
+  LocationToken, locationProvider
+} from '../../app/core/services/browser-hard-redirect.service';
 
 export const REQ_KEY = makeStateKey<string>('req');
 
@@ -44,6 +51,7 @@ export function getRequest(transferState: TransferState): any {
     RouterModule.forRoot([], {
       // enableTracing: true,
       useHash: false,
+      scrollPositionRestoration: 'enabled',
       preloadingStrategy:
       IdlePreload
     }),
@@ -74,10 +82,22 @@ export function getRequest(transferState: TransferState): any {
       provide: CookieService,
       useClass: ClientCookieService
     },
+    {
+      provide: KlaroService,
+      useClass: BrowserKlaroService
+    },
     {
       provide: SubmissionService,
       useClass: SubmissionService
-    }
+    },
+    {
+      provide: HardRedirectService,
+      useClass: BrowserHardRedirectService,
+    },
+    {
+      provide: LocationToken,
+      useFactory: locationProvider,
+    },
   ]
 })
 export class BrowserAppModule {
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index 5abd8e3aa14..c8ea81bdec2 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -25,6 +25,12 @@ import { ServerSubmissionService } from '../../app/submission/server-submission.
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
 import { Angulartics2RouterlessModule } from 'angulartics2/routerlessmodule';
 import { ModuleMapLoaderModule } from '@nguniversal/module-map-ngfactory-loader';
+import { ServerLocaleService } from 'src/app/core/locale/server-locale.service';
+import { LocaleService } from 'src/app/core/locale/locale.service';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
+import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
+import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service';
 
 export function createTranslateLoader() {
   return new TranslateJson5UniversalLoader('dist/server/assets/i18n/', '.json5');
@@ -73,7 +79,21 @@ export function createTranslateLoader() {
     {
       provide: SubmissionService,
       useClass: ServerSubmissionService
-    }
+    },
+    {
+      provide: LocaleService,
+      useClass: ServerLocaleService
+    },
+    // register ForwardClientIpInterceptor as HttpInterceptor
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: ForwardClientIpInterceptor,
+      multi: true
+    },
+    {
+      provide: HardRedirectService,
+      useClass: ServerHardRedirectService,
+    },
   ]
 })
 export class ServerAppModule {
diff --git a/src/polyfills.ts b/src/polyfills.ts
index ca40a803bad..151f4a4c455 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -52,11 +52,6 @@
  *
  */
 
-/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
- */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
@@ -64,4 +59,6 @@ import 'zone.js/dist/zone';  // Included with Angular CLI.
 import 'core-js/es';
 import 'core-js/features/reflect';
 
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
 import 'reflect-metadata';
diff --git a/src/robots.txt b/src/robots.txt
new file mode 100644
index 00000000000..04cbb888e06
--- /dev/null
+++ b/src/robots.txt
@@ -0,0 +1,151 @@
+# The URL to the DSpace sitemaps
+# XML sitemap is listed first as it is preferred by most search engines
+Sitemap: /sitemap_index.xml
+Sitemap: /sitemap_index.html
+
+##########################
+# Default Access Group
+# (NOTE: blank lines are not allowable in a group record)
+##########################
+User-agent: *
+# Disable access to Discovery search and filters; admin pages; processes; submission; workspace; workflow & profile page
+Disallow: /search
+Disallow: /admin/*
+Disallow: /processes
+Disallow: /submit
+Disallow: /workspaceitems
+Disallow: /profile
+Disallow: /workflowitems
+
+# Optionally uncomment the following line ONLY if sitemaps are working
+# and you have verified that your site is being indexed correctly.
+# Disallow: /browse/*
+#
+# If you have configured DSpace (Solr-based) Statistics to be publicly
+# accessible, then you may not want this content to be indexed
+# Disallow: /statistics
+#
+# You also may wish to disallow access to the following paths, in order
+# to stop web spiders from accessing user-based content
+# Disallow: /contact
+# Disallow: /feedback
+# Disallow: /forgot
+# Disallow: /login
+# Disallow: /register
+
+
+##############################
+# Section for misbehaving bots
+# The following directives to block specific robots were borrowed from Wikipedia's robots.txt
+##############################
+
+# advertising-related bots:
+User-agent: Mediapartners-Google*
+Disallow: /
+
+# Crawlers that are kind enough to obey, but which we'd rather not have
+# unless they're feeding search engines.
+User-agent: UbiCrawler
+Disallow: /
+
+User-agent: DOC
+Disallow: /
+
+User-agent: Zao
+Disallow: /
+
+# Some bots are known to be trouble, particularly those designed to copy
+# entire sites. Please obey robots.txt.
+User-agent: sitecheck.internetseer.com
+Disallow: /
+
+User-agent: Zealbot
+Disallow: /
+
+User-agent: MSIECrawler
+Disallow: /
+
+User-agent: SiteSnagger
+Disallow: /
+
+User-agent: WebStripper
+Disallow: /
+
+User-agent: WebCopier
+Disallow: /
+
+User-agent: Fetch
+Disallow: /
+
+User-agent: Offline Explorer
+Disallow: /
+
+User-agent: Teleport
+Disallow: /
+
+User-agent: TeleportPro
+Disallow: /
+
+User-agent: WebZIP
+Disallow: /
+
+User-agent: linko
+Disallow: /
+
+User-agent: HTTrack
+Disallow: /
+
+User-agent: Microsoft.URL.Control
+Disallow: /
+
+User-agent: Xenu
+Disallow: /
+
+User-agent: larbin
+Disallow: /
+
+User-agent: libwww
+Disallow: /
+
+User-agent: ZyBORG
+Disallow: /
+
+User-agent: Download Ninja
+Disallow: /
+
+# Misbehaving: requests much too fast:
+User-agent: fast
+Disallow: /
+
+#
+# If your DSpace is going down because of someone using recursive wget,
+# you can activate the following rule.
+#
+# If your own faculty is bringing down your dspace with recursive wget,
+# you can advise them to use the --wait option to set the delay between hits.
+#
+#User-agent: wget
+#Disallow: /
+
+#
+# The 'grub' distributed client has been *very* poorly behaved.
+#
+User-agent: grub-client
+Disallow: /
+
+#
+# Doesn't follow robots.txt anyway, but...
+#
+User-agent: k2spider
+Disallow: /
+
+#
+# Hits many times per second, not acceptable
+# http://www.nameprotect.com/botinfo.html
+User-agent: NPBot
+Disallow: /
+
+# A capture bot, downloads gazillions of pages with no public benefit
+# http://www.webreaper.net/
+User-agent: WebReaper
+Disallow: /
diff --git a/src/routes.ts b/src/routes.ts
deleted file mode 100644
index f3e963b25a3..00000000000
--- a/src/routes.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export const ROUTES: string[] = [
-  'home',
-  'items/:id',
-  'login',
-  'logout',
-  'collections/:id',
-  'communities/:id',
-  'login',
-  'logout',
-  'search',
-  'submit',
-  'workspaceitems/:id/edit',
-  'workflowitems/:id/edit',
-  '**'
-];
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 399cc064f30..42f52282dc8 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -8,7 +8,7 @@ $sidebar-items-width: 250px !default;
 $total-sidebar-width: $collapsed-sidebar-width + $sidebar-items-width !default;
 
 /* Fonts */
-$fa-font-path: "node_modules/@fortawesome/fontawesome-free/webfonts" !default;
+$fa-font-path: "/assets/fonts" !default;
 /* Images */
 $image-path: "../assets/images" !default;
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index c1f155fa398..a9a1ecb3914 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -37,3 +37,7 @@ $edit-item-metadata-field-width: 190px !default;
 $edit-item-language-field-width: 43px !default;
 
 $thumbnail-max-width: 175px !default;
+
+$dso-selector-list-max-height: 475px !default;
+$dso-selector-current-background-color: #eeeeee;
+$dso-selector-current-background-hover-color: darken($dso-selector-current-background-color, 10%);
diff --git a/tsconfig.server.json b/tsconfig.server.json
index d3e7ca2f81f..1329b32acee 100644
--- a/tsconfig.server.json
+++ b/tsconfig.server.json
@@ -2,7 +2,7 @@
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app-server",
-    "module": "commonjs"
+    "module": "commonjs",
   },
   "angularCompilerOptions": {
     "entryModule": "./src/modules/app/server-app.module#ServerAppModule"
diff --git a/webpack.config.ts b/webpack.config.ts
deleted file mode 100644
index 03af2d96387..00000000000
--- a/webpack.config.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-const webpackMerge = require('webpack-merge');
-
-const prodPartial = require('./webpack/webpack.prod');
-
-module.exports = (env, options) => {
-  env = env || {};
-  const commonPartial = require('./webpack/webpack.common')(env);
-  const clientPartial = require('./webpack/webpack.client')(env);
-  const { getAotPlugin } = require('./webpack/webpack.aot')(env);
-  const { getServerWebpackPartial } = require('./webpack/webpack.server')(env);
-
-  if (env.aot) {
-    console.log(`Running build for ${env.client ? 'client' : 'server'} with AoT Compilation`);
-  }
-
-  const serverPartial = getServerWebpackPartial(env.aot);
-
-  let serverConfig = webpackMerge({}, commonPartial, serverPartial, {
-    plugins: [
-      getAotPlugin('server', !!env.aot)
-    ]
-  });
-
-  let clientConfig = webpackMerge({}, commonPartial, clientPartial, {
-    plugins: [
-      getAotPlugin('client', !!env.aot)
-    ]
-  });
-  if (options.mode === 'production') {
-    serverConfig = webpackMerge({}, serverConfig, prodPartial);
-    clientConfig = webpackMerge({}, clientConfig, prodPartial);
-  }
-
-  const configs = [];
-
-  if (!env.aot) {
-    configs.push(clientConfig, serverConfig);
-  } else if (env.client) {
-    configs.push(clientConfig);
-  } else if (env.server) {
-    configs.push(serverConfig);
-  }
-
-  return configs;
-};
diff --git a/webpack.server.config.js b/webpack.server.config.js
index 264ae719397..7df6d6b83c8 100644
--- a/webpack.server.config.js
+++ b/webpack.server.config.js
@@ -25,7 +25,8 @@ module.exports = {
   module: {
     noParse: /polyfills-.*\.js/,
     rules: [
-      { test: /\.ts$/, loader: 'ts-loader',
+      {
+        test: /\.ts$/, loader: 'ts-loader',
         options: {
           configFile: "tsconfig.server.json"
         } },
diff --git a/webpack/webpack.browser.ts b/webpack/webpack.browser.ts
new file mode 100644
index 00000000000..bc281e9b43a
--- /dev/null
+++ b/webpack/webpack.browser.ts
@@ -0,0 +1,8 @@
+import { commonExports } from './webpack.common';
+
+module.exports = Object.assign({}, commonExports, {
+  target: 'web',
+  node: {
+    module: 'empty'
+  }
+});
diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index c8a450902bc..36e1f2e96b9 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -21,11 +21,13 @@ export const copyWebpackOptions = [
   }, {
     from: path.join(__dirname, '..', 'src', 'assets', 'i18n'),
     to: path.join('assets', 'i18n')
+  }, {
+    from: path.join(__dirname, '..', 'src', 'robots.txt'),
+    to: path.join('robots.txt')
   }
-  ];
+];
 
 export const commonExports = {
-  target: 'web',
   plugins: [
     new CopyWebpackPlugin(copyWebpackOptions),
     new HtmlWebpackPlugin({
@@ -37,9 +39,6 @@ export const commonExports = {
       defaultAttribute: 'defer'
     })
   ],
-  node: {
-    module: 'empty'
-  },
   module: {
     rules: [
       {
@@ -99,5 +98,3 @@ export const commonExports = {
     ],
   }
 };
-
-module.exports = commonExports;
diff --git a/webpack/webpack.prod.ts b/webpack/webpack.prod.ts
index 903ae366f51..e9fba2e65ef 100644
--- a/webpack/webpack.prod.ts
+++ b/webpack/webpack.prod.ts
@@ -1,48 +1,12 @@
+import { commonExports } from './webpack.common';
+import { buildRoot, projectRoot } from './helpers';
+
 const webpack = require('webpack');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-const CompressionPlugin = require('compression-webpack-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
-const cssnano = require('cssnano');
 const nodeExternals = require('webpack-node-externals');
 
-import { buildRoot, globalCSSImports, projectRoot, theme, themedTest, themedUse, themePath } from './helpers';
-
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const path = require('path');
-const fs = require('fs');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ScriptExtPlugin = require('script-ext-html-webpack-plugin');
-
-export const copyWebpackOptions = [
-  {
-    from: path.join(__dirname, '..', 'node_modules', '@fortawesome', 'fontawesome-free', 'webfonts'),
-    to: path.join('assets', 'fonts'),
-    force: undefined
-  },
-  {
-    from: path.join(__dirname, '..', 'src', 'assets', 'fonts'),
-    to: path.join('assets', 'fonts')
-  }, {
-    from: path.join(__dirname, '..', 'src', 'assets', 'images'),
-    to: path.join('assets', 'images')
-  }, {
-    from: path.join(__dirname, '..', 'src', 'assets', 'i18n'),
-    to: path.join('assets', 'i18n')
-  }
-];
-
-export const commonExports = {
+module.exports = Object.assign({}, commonExports, {
   plugins: [
-    new CopyWebpackPlugin(copyWebpackOptions),
-    new HtmlWebpackPlugin({
-      template: buildRoot('./index.html', ),
-      output: projectRoot('dist'),
-      inject: 'head'
-    }),
-    new ScriptExtPlugin({
-      defaultAttribute: 'defer'
-    }),
+    ...commonExports.plugins,
     new webpack.EnvironmentPlugin({
       'process.env': {
         NODE_ENV: JSON.stringify('production'),
@@ -50,64 +14,6 @@ export const commonExports = {
       }
     }),
   ],
-  module: {
-    rules: [
-      {
-        test: (filePath) => themedTest(filePath, 'scss'),
-        use: (info) => themedUse(info.resource, 'scss')
-      },
-      {
-        test: (filePath) => themedTest(filePath, 'html'),
-        use: (info) => themedUse(info.resource, 'html')
-      },
-      {
-        test: /\.ts$/,
-        loader: '@ngtools/webpack'
-      },
-      {
-        test: /\.scss$/,
-        exclude: [
-          /node_modules/,
-          buildRoot('styles/_exposed_variables.scss'),
-          buildRoot('styles/_variables.scss')
-        ],
-        use: [
-          {
-            loader: 'sass-loader',
-            options: {
-              sourceMap: true,
-              includePaths: [projectRoot('./'), path.join(themePath, 'styles')]
-            }
-          },
-          {
-            loader: 'sass-resources-loader',
-            options: {
-              resources: globalCSSImports()
-            },
-          }
-        ]
-      },
-      {
-        test: /(_exposed)?_variables.scss$/,
-        exclude: [/node_modules/],
-        use: [
-          {
-            loader: 'postcss-loader',
-            options: {
-              sourceMap: true
-            }
-          },
-          {
-            loader: 'sass-loader',
-            options: {
-              sourceMap: true,
-              includePaths: [projectRoot('./'), path.join(themePath, 'styles')]
-            }
-          }
-        ]
-      },
-    ],
-  },
   mode: 'production',
   recordsOutputPath: projectRoot('webpack.records.json'),
   entry: buildRoot('./main.server.ts'),
@@ -122,6 +28,4 @@ export const commonExports = {
       /sortablejs/,
       /ngx/]
   })],
-};
-
-module.exports = commonExports;
+});
diff --git a/webpack/webpack.test.ts b/webpack/webpack.test.ts
new file mode 100644
index 00000000000..bc281e9b43a
--- /dev/null
+++ b/webpack/webpack.test.ts
@@ -0,0 +1,8 @@
+import { commonExports } from './webpack.common';
+
+module.exports = Object.assign({}, commonExports, {
+  target: 'web',
+  node: {
+    module: 'empty'
+  }
+});
diff --git a/yarn.lock b/yarn.lock
index 7bac684f7d7..60aea5d1014 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1109,6 +1109,11 @@
   resolved "https://registry.yarnpkg.com/@types/circular-json/-/circular-json-0.4.0.tgz#7401f7e218cfe87ad4c43690da5658b9acaf51be"
   integrity sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 "@types/connect@*":
   version "3.4.33"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
@@ -1157,6 +1162,13 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/http-proxy@^1.17.4":
+  version "1.17.4"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.4.tgz#e7c92e3dbe3e13aa799440ff42e6d3a17a9d045b"
+  integrity sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==
+  dependencies:
+    "@types/node" "*"
+
 "@types/jasmine@*", "@types/jasmine@^3.3.9":
   version "3.5.7"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.7.tgz#c4237935a4b0db31ada6b0de10e2b0658e7b2643"
@@ -1434,9 +1446,9 @@ acorn-walk@^6.1.1:
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
 acorn@^6.0.7, acorn@^6.2.1:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
-  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 adm-zip@^0.4.9:
   version "0.4.14"
@@ -1602,10 +1614,13 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-any-promise@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
-  integrity sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=
+ansi-styles@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
 
 anymatch@^2.0.0:
   version "2.0.0"
@@ -1888,10 +1903,10 @@ base64-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-base64id@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
+base64id@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
 
 base@^0.11.1:
   version "0.11.2"
@@ -1981,7 +1996,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2007,7 +2022,7 @@ body-parser@1.18.2:
     raw-body "2.3.2"
     type-is "~1.6.15"
 
-body-parser@1.19.0, body-parser@^1.16.1:
+body-parser@1.19.0, body-parser@^1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
   integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
@@ -2082,7 +2097,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@~3.0.2:
+braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2186,24 +2201,6 @@ browserstack@^1.5.1:
   dependencies:
     https-proxy-agent "^2.2.1"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -2274,7 +2271,28 @@ cacache@12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3:
+cacache@^12.0.0:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^12.0.2, cacache@^12.0.3:
   version "12.0.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
   integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
@@ -2493,7 +2511,7 @@ check-types@^8.0.3:
   optionalDependencies:
     fsevents "~2.1.2"
 
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.8:
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -2512,6 +2530,21 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.4.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
 chownr@^1.1.1, chownr@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -2626,6 +2659,15 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -2689,12 +2731,19 @@ color-convert@^1.3.0, color-convert@^1.8.2, color-convert@^1.9.0, color-convert@
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -2752,7 +2801,7 @@ colors@1.1.2:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
   integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
-colors@^1.1.0, colors@^1.1.2:
+colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -2799,7 +2848,7 @@ component-emitter@1.2.1:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
   integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
-component-emitter@^1.2.1:
+component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -2873,7 +2922,7 @@ connect-history-api-fallback@^1.6.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
-connect@^3.6.0:
+connect@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
   integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
@@ -2988,7 +3037,7 @@ core-js@3.6.4, core-js@^3.6.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
   integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
 
-core-js@^2.2.0, core-js@^2.4.0:
+core-js@^2.4.0:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -3019,17 +3068,6 @@ coverage-istanbul-loader@2.0.3:
     merge-source-map "^1.1.0"
     schema-utils "^2.6.1"
 
-coveralls@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.0.tgz#22ef730330538080d29b8c151dc9146afde88a99"
-  integrity sha512-ZppXR9y5PraUOrf/DzHJY6gzNUhXYE3b9D43xEXs4QYZ7/Oe0Gy0CS+IPKWFfvQFXB3RG9QduaQUFehzSpGAFw==
-  dependencies:
-    js-yaml "^3.6.1"
-    lcov-parse "^0.0.10"
-    log-driver "^1.2.5"
-    minimist "^1.2.0"
-    request "^2.79.0"
-
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -3332,11 +3370,16 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-format@^2.0.0:
+date-format@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
   integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
 
+date-format@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-3.0.0.tgz#eb8780365c7d2b1511078fb491e6479780f3ad95"
+  integrity sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==
+
 debug-loader@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/debug-loader/-/debug-loader-0.0.1.tgz#44dc37e09e3c39e6af334681960f70a534a9d056"
@@ -3344,7 +3387,7 @@ debug-loader@^0.0.1:
   dependencies:
     loader-utils "^0.2.12"
 
-debug@*, debug@^4.1.0, debug@^4.1.1:
+debug@*, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -3598,7 +3641,7 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
-dom-serialize@^2.2.0:
+dom-serialize@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
   integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
@@ -3778,27 +3821,27 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
+engine.io-client@~3.4.0:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.2.tgz#4fb2ef2b1fe1d3aa1c621c6a8d87f1fc55426b50"
+  integrity sha512-AWjc1Xg06a6UPFOBAzJf48W1UR/qKYmv/ubgSCumo9GXgvL/xGIvo05dXoBL+2NTLMipDI7in8xK61C17L25xg==
   dependencies:
-    component-emitter "1.2.1"
+    component-emitter "~1.3.0"
     component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.1"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
     has-cors "1.1.0"
     indexof "0.0.1"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    ws "~3.3.1"
+    ws "~6.1.0"
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
-  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
+engine.io-parser@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.0.tgz#312c4894f57d52a02b420868da7b5c1c84af80ed"
+  integrity sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -3806,17 +3849,17 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
     blob "0.0.5"
     has-binary2 "~1.0.2"
 
-engine.io@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
-  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
+engine.io@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.1.tgz#a61cbc13fa0cb27d9453fd079a29ee980564b069"
+  integrity sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw==
   dependencies:
     accepts "~1.3.4"
-    base64id "1.0.0"
+    base64id "2.0.0"
     cookie "0.3.1"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.0"
-    ws "~3.3.1"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    ws "^7.1.2"
 
 enhanced-resolve@4.1.0:
   version "4.1.0"
@@ -4041,6 +4084,11 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+express-rate-limit@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.1.3.tgz#656bacce3f093034976346958a0f0199902c9174"
+  integrity sha512-TINcxve5510pXj4n9/1AMupkj3iWxl3JuZaWhCdYDlZeoCPqweGZrxbrlqTCFb1CT5wli7s8e2SH/Qz2c9GorA==
+
 express@4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
@@ -4234,9 +4282,9 @@ faye-websocket@~0.11.1:
     websocket-driver ">=0.5.1"
 
 figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
 figures@^2.0.0:
   version "2.0.0"
@@ -4283,6 +4331,11 @@ filesize@^3.6.1:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
   integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
+filesize@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -4360,7 +4413,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.0.0:
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -4378,10 +4431,10 @@ findup-sync@3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-flatted@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
-  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+flatted@^2.0.1, flatted@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -4482,7 +4535,7 @@ fs-extra@^0.22.1:
     jsonfile "^2.1.0"
     rimraf "^2.2.8"
 
-fs-extra@^7.0.0, fs-extra@^7.0.1:
+fs-extra@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -4491,6 +4544,15 @@ fs-extra@^7.0.0, fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -4631,7 +4693,7 @@ glob@7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -4740,13 +4802,6 @@ globby@^9.0.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-gonzales-pe@^4.0.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2"
-  integrity sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==
-  dependencies:
-    minimist "1.1.x"
-
 got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -4764,11 +4819,16 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2:
+graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.2:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
+graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
 gzip-size@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -4914,11 +4974,16 @@ hoopy@^0.1.4:
   resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
   integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
+hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.8.7"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.7.tgz#4d2e0d5248e1cfabc984b0f6a6d75fe36e679511"
   integrity sha512-ChkjQtKJ3GI6SsI4O5jwr8q8EPrWCnxuc4Tbx+vRI5x6mDOpjKKltNo1lRlszw3xwgTOSns1ZRBiMmmwpcvLxg==
 
+hosted-git-info@^2.7.1:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -5067,7 +5132,18 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy@^1.13.0, http-proxy@^1.17.0:
+http-proxy-middleware@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.0.5.tgz#4c6e25d95a411e3d750bc79ccf66290675176dc2"
+  integrity sha512-CKzML7u4RdGob8wuKI//H8Ein6wNTEQR7yjVEzPbhBLGdOfkfvgTnp2HLnniKBDP9QW4eG10/724iTWLBeER3g==
+  dependencies:
+    "@types/http-proxy" "^1.17.4"
+    http-proxy "^1.18.1"
+    is-glob "^4.0.1"
+    lodash "^4.17.19"
+    micromatch "^4.0.2"
+
+http-proxy@^1.17.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
   integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
@@ -5076,6 +5152,15 @@ http-proxy@^1.13.0, http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -5665,12 +5750,10 @@ isarray@2.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
   integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
-isbinaryfile@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
+isbinaryfile@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
+  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -5857,7 +5940,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.6.1:
+js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -6017,38 +6100,35 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@~4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
-  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
+karma@^5.0.9:
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-5.0.9.tgz#11a119b0c763a806fdc471b40c594a2240b5ca13"
+  integrity sha512-dUA5z7Lo7G4FRSe1ZAXqOINEEWxmCjDBbfRBmU/wYlSMwxUQJP/tEEP90yJt3Uqo03s9rCgVnxtlfq+uDhxSPg==
   dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    braces "^2.3.2"
-    chokidar "^2.0.3"
-    colors "^1.1.0"
-    connect "^3.6.0"
-    core-js "^2.2.0"
+    body-parser "^1.19.0"
+    braces "^3.0.2"
+    chokidar "^3.0.0"
+    colors "^1.4.0"
+    connect "^3.7.0"
     di "^0.0.1"
-    dom-serialize "^2.2.0"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.11"
-    log4js "^4.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
+    dom-serialize "^2.2.1"
+    flatted "^2.0.2"
+    glob "^7.1.6"
+    graceful-fs "^4.2.4"
+    http-proxy "^1.18.1"
+    isbinaryfile "^4.0.6"
+    lodash "^4.17.15"
+    log4js "^6.2.1"
+    mime "^2.4.5"
+    minimatch "^3.0.4"
+    qjobs "^1.2.0"
+    range-parser "^1.2.1"
+    rimraf "^3.0.2"
+    socket.io "^2.3.0"
     source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
+    tmp "0.2.1"
+    ua-parser-js "0.7.21"
+    yargs "^15.3.1"
 
 killable@^1.0.1:
   version "1.0.1"
@@ -6079,6 +6159,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+klaro@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.6.3.tgz#b2aaa810d17f073c9a1b5eab618a9f13d5f40fa3"
+  integrity sha512-rRP37FaJaHHSScHIe3YUdMZJ1asxOF5+C/RMrFB2RzhAUfGVMM5/GiucECM3Si1lhW2LL0xGVymE8JhYZl2Bjg==
+
 last-call-webpack-plugin@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555"
@@ -6101,11 +6186,6 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-lcov-parse@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
-  integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
-
 less-loader@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
@@ -6251,15 +6331,15 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-log-driver@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
-  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
+lodash@^4.17.19:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 log-symbols@^2.1.0, log-symbols@^2.2.0:
   version "2.2.0"
@@ -6268,16 +6348,16 @@ log-symbols@^2.1.0, log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
-log4js@^4.0.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
-  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
+log4js@^6.2.1:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.3.0.tgz#10dfafbb434351a3e30277a00b9879446f715bcb"
+  integrity sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==
   dependencies:
-    date-format "^2.0.0"
+    date-format "^3.0.0"
     debug "^4.1.1"
-    flatted "^2.0.0"
+    flatted "^2.0.1"
     rfdc "^1.1.4"
-    streamroller "^1.0.6"
+    streamroller "^2.2.4"
 
 loglevel@^1.6.4:
   version "1.6.7"
@@ -6301,7 +6381,7 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@4.1.x, lru-cache@^4.0.1:
+lru-cache@^4.0.1:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -6512,6 +6592,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -6542,11 +6630,16 @@ mime@1.6.0, mime@^1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.3.1, mime@^2.4.4:
+mime@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
   integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
 
+mime@^2.4.5:
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -6584,25 +6677,10 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@1.1.x:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
-  integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
-
-minimist@1.2.0, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+minimist@1.2.0, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -6672,11 +6750,11 @@ mixin-deep@^1.2.0:
     is-extendable "^1.0.1"
 
 mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"
 
 moment@^2.22.1:
   version "2.24.0"
@@ -6781,10 +6859,12 @@ ng-mocks@^8.1.0:
   resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-8.1.0.tgz#d00a5e53ae53587f35c68147826590fab71a1658"
   integrity sha512-/314nyU6UrONCUKfvFRuJPLpNBxqocwJmQBlPy4he5Vueu6gObXjy+KLUlbbENuA7zTeBjp//RA6w/Fa1yQ4Fw==
 
-ng2-file-upload@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.2.1.tgz#5563c5dfd6f43fbfbe815c206e343464a0a6a197"
-  integrity sha1-VWPF39b0P7++gVwgbjQ0ZKCmoZc=
+ng2-file-upload@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.4.0.tgz#8dea28d573234c52af474ad2a4001b335271e5c4"
+  integrity sha512-3J/KPU/tyh/ad6TFeUbrxX+SihUj0iOEt2Zsg4EX7mB3GFiQscXOfcUOxCkBtPWWWaqt3azrYbVGzsYa3/7NzQ==
+  dependencies:
+    tslib "^1.9.0"
 
 ng2-nouislider@^1.8.2:
   version "1.8.2"
@@ -6835,9 +6915,9 @@ no-case@^2.2.0:
     lower-case "^1.1.1"
 
 node-fetch-npm@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
-  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
+  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
@@ -7022,9 +7102,9 @@ npm-pick-manifest@^2.2.3:
     semver "^5.4.1"
 
 npm-registry-fetch@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz#3c2179e39e04f9348b1c2979545951d36bee8766"
-  integrity sha512-WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz#cb87cf7f25bfb048d6c3ee19d115bebf93ea5bfa"
+  integrity sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -7241,14 +7321,6 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optimist@^0.6.1, optimist@~0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
 optimize-css-assets-webpack-plugin@^5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572"
@@ -7563,6 +7635,11 @@ picomatch@^2.0.4, picomatch@^2.0.7:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
   integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
 
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
 pidtree@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
@@ -7905,7 +7982,7 @@ postcss-image-set-polyfill@^0.3.5:
     postcss "^6.0.1"
     postcss-media-query-parser "^0.2.3"
 
-postcss-import@12.0.1:
+postcss-import@12.0.1, postcss-import@^12.0.1:
   version "12.0.1"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
   integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
@@ -8209,21 +8286,6 @@ postcss-responsive-type@1.0.0:
   dependencies:
     postcss "^6.0.6"
 
-postcss-sass@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.2.0.tgz#e55516441e9526ba4b380a730d3a02e9eaa78c7a"
-  integrity sha512-cUmYzkP747fPCQE6d+CH2l1L4VSyIlAzZsok3HPjb5Gzsq3jE+VjpAdGlPsnQ310WKWI42sw+ar0UNN59/f3hg==
-  dependencies:
-    gonzales-pe "^4.0.3"
-    postcss "^6.0.6"
-
-postcss-scss@^1.0.2:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.6.tgz#ab903f3bb20161bc177896462293a53d4bff5f7a"
-  integrity sha512-4EFYGHcEw+H3E06PT/pQQri06u/1VIIPjeJQaM8skB80vZuXMhp4cSNV5azmdNkontnOID/XYWEvEEELLFB1ww==
-  dependencies:
-    postcss "^6.0.23"
-
 postcss-selector-matches@^3.0.0, postcss-selector-matches@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz#e5634011e13950881861bbdd58c2d0111ffc96ab"
@@ -8267,23 +8329,6 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-smart-import@^0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/postcss-smart-import/-/postcss-smart-import-0.7.6.tgz#259deb84aa28f138458218ecc0e9a84c61ada6a4"
-  integrity sha512-9OpXaQ1uMMHWafUh0RWIpAKa3xxUDC2yyxicUPpGffH33nzbZG4/z+nk5Ocw5gGZ+3qkXV91iDV23Cmxf2Jhew==
-  dependencies:
-    babel-runtime "^6.26.0"
-    lodash "^4.17.4"
-    object-assign "^4.1.1"
-    postcss "^6.0.14"
-    postcss-sass "^0.2.0"
-    postcss-scss "^1.0.2"
-    postcss-value-parser "^3.3.0"
-    promise-each "^2.2.0"
-    read-cache "^1.0.0"
-    resolve "^1.5.0"
-    sugarss "^1.0.1"
-
 postcss-svgo@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
@@ -8382,13 +8427,6 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-promise-each@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/promise-each/-/promise-each-2.2.0.tgz#3353174eff2694481037e04e01f77aa0fb6d1b60"
-  integrity sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=
-  dependencies:
-    any-promise "^0.1.0"
-
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -8426,10 +8464,10 @@ protractor-istanbul-plugin@2.0.0:
     q "^1.4.1"
     uuid "^2.0.1"
 
-protractor@~5.4.0:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.3.tgz#35f050741e404a45868618ea648745d89af31683"
-  integrity sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA==
+protractor@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03"
+  integrity sha512-UqkFjivi4GcvUQYzqGYNe0mLzfn5jiLmO8w9nMhQoJRLhy2grJonpga2IWhI6yJO30LibWXJJtA4MOIZD2GgZw==
   dependencies:
     "@types/q" "^0.0.32"
     "@types/selenium-webdriver" "^3.0.0"
@@ -8439,13 +8477,13 @@ protractor@~5.4.0:
     glob "^7.0.3"
     jasmine "2.8.0"
     jasminewd2 "^2.1.0"
-    optimist "~0.6.0"
     q "1.4.1"
     saucelabs "^1.5.0"
     selenium-webdriver "3.6.0"
     source-map-support "~0.4.0"
     webdriver-js-extender "2.1.0"
-    webdriver-manager "^12.0.6"
+    webdriver-manager "^12.1.7"
+    yargs "^15.3.1"
 
 proxy-addr@~2.0.2, proxy-addr@~2.0.5:
   version "2.0.6"
@@ -8537,7 +8575,7 @@ q@^1.1.2, q@^1.4.1:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qjobs@^1.1.4:
+qjobs@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
@@ -8595,7 +8633,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.0, range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
+range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
@@ -8728,6 +8766,13 @@ readdirp@~3.3.0:
   dependencies:
     picomatch "^2.0.7"
 
+readdirp@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
+  dependencies:
+    picomatch "^2.2.1"
+
 reduce-css-calc@^1.2.7:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -8898,7 +8943,7 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request@^2.79.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
+request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -9039,14 +9084,14 @@ rimraf@3.0.0:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -9116,9 +9161,9 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-regex@^1.1.0:
   version "1.1.0"
@@ -9477,46 +9522,55 @@ socket.io-adapter@~1.1.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
   integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
 
-socket.io-client@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
+socket.io-client@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
+  integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
     component-bind "1.0.0"
     component-emitter "1.2.1"
-    debug "~3.1.0"
-    engine.io-client "~3.2.0"
+    debug "~4.1.0"
+    engine.io-client "~3.4.0"
     has-binary2 "~1.0.2"
     has-cors "1.1.0"
     indexof "0.0.1"
     object-component "0.0.3"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    socket.io-parser "~3.2.0"
+    socket.io-parser "~3.3.0"
     to-array "0.1.4"
 
-socket.io-parser@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
     isarray "2.0.1"
 
-socket.io@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
+socket.io-parser@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
+  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
   dependencies:
-    debug "~3.1.0"
-    engine.io "~3.2.0"
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    isarray "2.0.1"
+
+socket.io@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
+  integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+  dependencies:
+    debug "~4.1.0"
+    engine.io "~3.4.0"
     has-binary2 "~1.0.2"
     socket.io-adapter "~1.1.0"
-    socket.io-client "2.1.1"
-    socket.io-parser "~3.2.0"
+    socket.io-client "2.3.0"
+    socket.io-parser "~3.4.0"
 
 sockjs-client@1.4.0:
   version "1.4.0"
@@ -9833,16 +9887,14 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-streamroller@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
-  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
+streamroller@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-2.2.4.tgz#c198ced42db94086a6193608187ce80a5f2b0e53"
+  integrity sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==
   dependencies:
-    async "^2.6.2"
-    date-format "^2.0.0"
-    debug "^3.2.6"
-    fs-extra "^7.0.1"
-    lodash "^4.17.14"
+    date-format "^2.1.0"
+    debug "^4.1.1"
+    fs-extra "^8.1.0"
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
@@ -10011,13 +10063,6 @@ stylus@0.54.5:
     sax "0.5.x"
     source-map "0.1.x"
 
-sugarss@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
-  integrity sha512-3qgLZytikQQEVn1/FrhY7B68gPUUGY3R1Q1vTiD5xT+Ti1DP/8iZuwFet9ONs5+bmL8pZoDQ6JrQHVgrNlK6mA==
-  dependencies:
-    postcss "^6.0.14"
-
 supports-color@6.1.0, supports-color@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
@@ -10188,7 +10233,14 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
+tmp@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
+tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
@@ -10391,6 +10443,11 @@ typescript@^2.5.0:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
+ua-parser-js@0.7.21:
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
+  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
+
 uglify-js@3.4.x:
   version "3.4.10"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
@@ -10399,11 +10456,6 @@ uglify-js@3.4.x:
     commander "~2.19.0"
     source-map "~0.6.1"
 
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
 undefsafe@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae"
@@ -10586,14 +10638,6 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-useragent@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -10736,7 +10780,7 @@ webdriver-js-extender@2.1.0:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
 
-webdriver-manager@^12.0.6:
+webdriver-manager@^12.1.7:
   version "12.1.7"
   resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162"
   integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==
@@ -10962,9 +11006,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 when@~3.6.x:
   version "3.6.4"
@@ -10990,11 +11034,6 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
@@ -11026,6 +11065,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11047,14 +11095,17 @@ ws@^6.0.0, ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@~3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+ws@^7.1.2:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
+  integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
+
+ws@~6.1.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
   dependencies:
     async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
 
 xdg-basedir@^3.0.0:
   version "3.0.0"
@@ -11125,6 +11176,14 @@ yargs-parser@^13.0.0, yargs-parser@^13.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^18.1.1:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs@12.0.5, yargs@^12.0.1:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -11177,6 +11236,23 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
+yargs@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.1"
+
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"