(U-00026643): Apply new conventions for glyph granularity; add