bug fixes with translation
Merge branch 'release/1.1.3'