changed to get device id rather than uuid
Merge branch 'latest'