Updated multi_file version to match current master.