Fixed various missing files
Merge branch 'master' into sdk_fixes
Merge branch 'sdk_fixes' into sizzlingplugins