Merge pull request #23316 from dhewg/prom