Merge branch 'so/glossary-ancestor'