DBC 607 - Duplicate table moved to condition state.
Merge branch 'DBC-607' into develop