Merging SimulatorApp changes
Merging SimulatorApp changes
Merging SimulatorApp changes