Bump xiaoping and make subsequent changes.