[OE-4010] fixed table names
Merge branch 'release/1.6' into develop