Merged from Shouye