Merge pull request #1348 from TheBlueMatt/2022-03-timer-tick-count