Merge branch 'timecounter-next'