DM-1070 fix unit tests which depend on table version 0
Merge remote-tracking branch 'origin/master' into tickets/DM-1070
Merge branch 'tickets/DM-1070'