[OE-3914] fixed collation
Merge branch 'master' into feature/table-versioning