Merge branch 'ta/glossary' into maint