merged from shouye.