Added Term Merge.
Merge branch 'feature/139'