Merge branch 'n-terminal'