Nathan/sdk upgrade

sidekick @christynicol