(U-00022034): Apply new conventions for glyph granularity; add