Merge pull request #17697 from mikedn/vec-hnd