Merge "Fix Sdc Controller"