Goal: 

• Turns out some of the last PSs of the previous change broke the "get all metrics" change. It needs to be rebased and conflicts need to be solved. Since it's not a trivial rebase, spend some time on verifying everything still works correctly.

Acceptance Criteria:

• The patch is mergable and it's verified that it works