Project: datamanagement
Issue DM-6727: Message refinement #2
Story points: 12