CDB-2803
CDB-2803 improved errors, now all follow the standard flow of returning an error code
Merge branch 'master' into CDB-1100