Merge branch 'bugfix/1629-fav-race-condition' into 'develop'