Rebase on current SNAPSHOT and add dummy source for zero counts