Merge branch 'develop' into sim_scheduler