Update flyweight, multi_index from develop.