Merge branch 'bugfix/announce-timeline-flooding' into 'develop'