Merge "Update SDC library"