Merge "Rework the SDC Config"