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