Merging Neel's work on timers. Timer-list already pulled down stream.
Merge branch 'nks5295-master'