add device owner field
Merge branch 'dev'