Merge "Check against SDK now that it's updated" into sc-dev