Merge branch 'device-registration'
Merge branch 'alias'