Merge "correct way of group statistics processing"