Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'