Merge branch 'device' into develop