Cherry-pick this commit https://github.com/dataquest-dev/dspace-angular/pull/957/commits/076c168aac08344d40cdccacbe8e9a6e945c3334