fixed trying to add a row to a table when it's not present
Merge remote-tracking branch 'origin/cdb-113' into release/2.1.3.5