Merge pull request #17737 from fiigii/vectortests