Merge branch 'jc/count'