Project: datamanagement
Issue DM-1739: Catch-all epic for essential fixes during DM-W15-4
Story points: 10