re-added terminal after rebase
Merge commit '5fb2fb6' into HEAD