Merge branch 'bugfix/announce-race-condition' into 'develop'