[AS7-6608] Updates to messages / logs