CDB-3126 Adding proper log
CDB-3126 better formatted to differentiate fields
Merge branch 'CDB-3126' into CDB-3126-staging