Merge get_device_info working