MODIFIED for DMI integration
Merge branch 'origin/DMI_Integration'