Merge pull request #17977 from paroj:hervec