Merge pull request #2223 from jwillemsen/jwi-vs2022_release