Merge upstream

gauge + vm metrics