Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'