Merge branch 'hotfix/ticket_fix'
Submit fix
Merge branch 'hotfix/submit' into develop