Merge pull request #3035 from TheBlueMatt/2024-04-upstream-123-bindings