Merge pull request #2400 from TheBlueMatt/2023-07-kill-vec_type