Merge branch 'sim_scheduler' into develop

1 job for develop
in 0 seconds and was queued for 0 seconds