Merge branch 'nd/count-garbage'