#1687 Language issues in backend
Merge pull request #1690 from xillibit/k30_bugs11

#1687 Language issues in backend