Merge chenying branch to master