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