Project: datamanagement
Issue DM-6856: TBD related emergent work in August
Story points: 5