Merge branch 'rn/glossary-typofix'