Project: datamanagement
Issue DM-4822: Code review
DM-4133, DM-4800, DM-4709, DM-4707, DM-4814
Story points: 4