(U-00020498): Apply new conventions for glyph granularity for