Merge branch 'cid' into LGC
Add LGC glyph map