Merge branch 'nd/term-columns'