Project: datamanagement
Issue DM-4340: S17 Butler
Story points: 100