Merge "Fix multisim issue with sim call manager."