Merge pull request #1579 from kant2002/master

Update declaration of the Device interface