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