merge huya changes.