adjust changes
Merge "adjust changes" into 0.6.x