Merge pull request #2878 from TheBlueMatt/2024-02-fix-build