2.x client updates

also set InstanceInfo to null here?