DeviceGateway changes in code related to DC caused by #8