Backport scheduler fixes to 1.2

Description

Backport !1040 (merged), !1043 (merged) and !1067 (merged) (plus a small cleanup commit).

Fixes #525 (closed)

Edited by Abderrahim Kitouni

Merge request reports

Loading
Loading