merged changes that come from new device server api