Merge branch 'hotfix/term_default_timeout'
fix
Merge branch 'hotfix/terminal_timeout_zero' into develop