added legacy output format for metrics
Merge branch 'BEER_Edwin'