rebase the master to current chinese version