merge from rock wu

merge from rockwu