(g2-RUI6-E072): Apply new conventions for glyph granularity for