OO-1211 beautify glossary
OO-1211 beautify glossary
OO-1209: import some metadatas
Merge with 03975922272c6b4671c4da0d56fe2b0454688f9a