Scheduled task enhancements (P-282702)