Scheduled Task Enhancements 2 (PLAT-1631)