Further improved scheduler API
Extend CauseTracked
Merge branch 'blockevents', remote-tracking branch 'upstream/master' into blockevents