Merge branch 'jc/skip-count'