DC: keep it simple, do these changes once needed

Change-Id: I1b8c01d5dc22f14360d538398ef0394b767138b5