This might also be different, once we have the improved metrics backend work, and updated DB queries/triggers from Massimiliano Ziccardi, which will come with: AGPUSH-2051