Merge branch 'jc/count' into next