-merge code from xiufeng