Merge branch 'kb/tracking-count-no-merges'