Merge branch 'develop' into bigfix-messages-parsing