add timers N&N
(cherry picked from commit 861ba90d284bbb2a3ff7a621b3b780b408814177)