Fixed various missing files
Merge branch 'master' into sdk_fixes