Merge pull request #17543 from stintel/vallumd