Merge pull request #4724 from eval-exec/exec/freezer-metrics

Merge pull request #4724 from eval-exec/exec/freezer-metrics #6330