Pull in latest changes to SDK