Update metrics handling

Vitalii Fisenko requested to merge vitalii/metrics_upd into master

Merge request reports