(g2-M-01822): Apply new conventions for glyph granularity for a