Merge "Rework getMetrics() api per API council" into oc-dev