[EDU-4034] Merge with glossary changes