Merge branch 'timers/rtc'