Project: datamanagement
Issue DM-6725: Message refinement , in light of development #1
Story points: 12