deviceString improvements
Merge pull request #3063 from sebv/device-string

deviceString improvements