Modify sample_run_metrics lookup
Merge branch 'hotfix/fix_sample_run_metrics_bug'