update v0.6 branch to 0.6.1