Merge pull request #1472 from TheBlueMatt/2022-06-less-secp-ctx