Update flyweight from develop.