Merge "doc: Add missing terms to the glossary" into integration