Fixed the bug
Merge branch 'hotfix/jira-0000'