Merge "Fix sim startup."