Translation bug
Merge branch 'feature/1092-translation-bug' into develop