Improve DGD support

Change-Id: I03a2a0cf296e4cf46ad5f40740fb7871671cb619
12 files changed