Merge pull request #1962 from TheBlueMatt/2023-01-bp-no-std