backporting patch to DS-1603 to dspace 1.8