Merge branch 'fix-avs-metrics-state-reorder' into 'master'

Fix reorder metrics states on compact procedures.

See merge request !6789

(cherry picked from commit 6ed5df70)

3b5097a7 Fix reorder metrics states on compact procedures.
6 jobs for !6791 with cherry-pick-6ed5df70 in 15 minutes and 19 seconds (queued for 4 seconds)
latest merge request