Merge "Fix the Sdc Controller"