Hotfix/firoze/140213 jira htfx1234