Backport of report statistic fix
Conflicts:

	packages