Clean up of ProductStats (report, calculator, tests)
Merge remote-tracking branch 'origin/master'