Merge "Modified MultiSim APIs"