Merge "Bug fixes in models simulators"