Merge branch 'hotfix/fix-translate-issues-in-exceptions' into develop
Fix bug in condition
Merge branch 'develop'