Merge "Enable Prometheus support"