Simulation dev

Grant Giansantirequested to merge
simulation_dev into develop

Merge request reports