merge from PlayerRigUpdate2/mergemain