Merge remote-tracking branch 'origin/v0.10'