Improve scheduling objects deletion#249

tchapi wants to merge 6 commits intomaintchapi/davis:mainfrom

cc/fix-scheduling-objects-deletiontchapi/davis:cc/fix-scheduling-objects-deletionCopy head branch name to clipboard