Update multi_index, flyweight from master.