Merge "Collation: Workaround for incorrect collation of Estonian"