Merge branch 'timers/for-arm' into timers/core