Merge branch 'beta' into dev

Sync Device Classes

Canceled