Support same-block scheduling

Hansrequested to merge
hans/scheduler-timing into develop

Merge request reports