Merge branch 'topic/timer-cleanup' into for-next