Update flyweight from master.