First phase of DTGOV-127: Configuration
Merge branch 'EricWittmann-DTGOV-127'