Merge pull request #3061 from TheBlueMatt/2024-05-bindings-upstream