Merging in SDK updates