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