Fix file_managed:uri collation
Translations are back
Fix file_managed:uri collation, part 2
Merge branch 'develop'