Merge "Update SDNC Client"