DBC 1202 - Adds admin config form.
DBC 1202 - CR fixes.
Merge branch 'DBC-1202' into develop