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