Merge pull request #884 from TheBlueMatt/2021-04-bp-bindings