Merge branch 'jn/glossary-revision' into maint