Project: datamanagement
Issue DM-4406: Review of [DM-2983] part 2
Second part and final of reviewing DM-2983
Story points: 2