DBC 1202 - Adds default value.
Merge branch 'DBC-1202' into develop