Feature/term on column

Pivotal id 52284853