Merge "Provide complete set of Nova metrics"