Merge branch 'feature-a/correct-output-messages' into 'dev'

Feature a/correct output messages

See merge request !664
6 jobs for dev in 8 minutes and 33 seconds (queued for 2 seconds)