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