Merge pull request #3013 from TheBlueMatt/2024-04-122-bindings