OTC-236
- last steps to use selected translation service and some refactoring