Merge "Fix bug 2450 - Statistics collection slow - performance"