Merge "Update SDC branch" into amsterdam