Merge "Updated code for metrics logs"