merge from playerrigupdate2