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