[OE-3301] make primary key consistent with other tables
[OE-3301] added original key back in
Merge branch 'release/1.4' into develop