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