Merge branch 'issue/142' into 'development'

SCRUM#142 - Repair messages errors from windows test

See merge request !102
7 jobs for development in 23 minutes and 9 seconds (queued for 7 seconds)