Merge "change in MDCSetup class"

No match.