Merge branch 'bugfix/repeating-announce' into 'develop'