Fight with races part 1
Merge remote-tracking branch 'upstream/master' into next