Issue #3210972: Handle scheduler

trishen requested to merge issue/publication_date-3210972:3210972-handle-scheduler into 8.x-2.x Apr 28, 2021