SDK build fix
Merge branch 'dev'