NTFY-47: improve common metrics support