Feature/455

Merge translation enhancements