Wait scheduled timers completed
Merge pull request #2619 from tricknotes/wait-scheduled-timers

Wait scheduled timers completed