Hotfix/virtual terminal merge