Merge pull request #5903 from aparcar/prometheus