Merge "Fix the SDC controller"