Merge branch 'hotfix/submodule'
Removes universal support
Merge branch 'hotfix/device-support' into develop