Merge branch 'ta/glossary'