"duplicate" authors issue fixed
Merge branch 'master' into beta
Device enum
Merge branch 'master' into beta