Project: datamanagement
Issue DM-1826: Catch-all epic for essential fixes during DM-W15-1,2,3 
Story points: 10