Project: datamanagement
Issue DM-6855: TBD related emergent work in July
Story points: 5