Merge branch 'hotfix/helpdesk_timeout' into master-2