Merge pull request #2932 from TheBlueMatt/2023-04-ci-fix