DS-1804

Patch for https://jira.duraspace.org/browse/DS-1804.