Bump xiaoping; make subsequent changes.