Merge "Refactor MetricActivation initialization"