merge 0.6.x