Merge with latest SDK