Fixes
Merge branch 'v0.11' into race_condition