Update math, flyweight from develop.