Project: datamanagement
Issue DM-6883: Address additional emergent concerns 
Address TBD additional emergent concerns
Story points: 2