Added new device id support (issue #3031)