Merge branch '1996-dont-break-on-chatmessages' into 'develop'