merge from v0.6.1.x