Merge pull request #9276 from shirase/timer-n-fix