Update to latest SDK
Merge branch 'dev-update'