Merge first sdk setup commits