Refactor timer repro part2

[tevoinea]

#1837

[ghost]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

❌ tevoinea sign now
_{You have signed the CLA already but the status is still pending? Let us recheck it.}