Failing test first
Add ColumnMappingOption and now the test passes
Merge branch 'feature/optional_dbcolumn_mapping' into develop