4753ff4466
Merge commit '7e8cbfc2bc3ea2334c38db7fd2b6a1e17eefcac6' * commit '7e8cbfc2bc3ea2334c38db7fd2b6a1e17eefcac6': Fix the simulator.