HOT FIX _1
Merge branch 'hotfix/JIRA_EMERGENCY_1'