Merge pull request #2229 from TheBlueMatt/2023-04-115-bindings-upstream-2