more robust if no such device
still removing optparser
still removing optparser
Merge remote-tracking branch 'upstream/master'