Merge "update the SDC client APIs"