merge 0.6.x to 0.7.x