Merge "Replace sdc client"