Merge pull request #2798 from TheBlueMatt/2023-12-119-bindings-upstream