Merge "Fix DMI Stub dependency issues"