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