Merge pull request #2061 from TheBlueMatt/2023-02-114-upstream-bindings