Resolve "Adapt to new flux metrics"

Arie Petersonrequested to merge
1642-adapt-to-new-flux-metrics into main

Merge request reports