Merge remote-tracking branch 'origin/sim_scheduler' into develop