This fixes #8314.  If a DeviceID is given, then it goes to that device.