Merge branch 'update-messages-fix' into 'master'

Fixed update messages command.

See merge request !26
5 jobs for master
in 9 minutes and 46 seconds and was queued for 2 seconds