Merge remote-tracking branch 'origin' into bugfix-race-conditions
Merge branch 'bugfix-race-conditions'