Fixes
Merge remote-tracking branch 'origin/experimental-v0.8.0' into experimental-v0.8.0