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