Merging in latest SDK changes