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