ticket 13: device ID support as per spec