Merge "change in MDCSetup class"