Changes for feature parity with Glyphs version