OpenOrder_updateSimulation: Re-apply changes on top of cherry picked commits