Merge remote-tracking branch 'tance/terminal-support'