Merge recent device enumeration changes to satisfy dependencies.
Attach a file by drag & drop or click to upload
