(g2-GT-03429): Apply new conventions for glyph granularity for