Merge pull request #2610 from castillofrancodamian/statistics