Merge "Fix Sdc controller"