Merge branch 'dropcount'