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