Merge pull request #2828 from TheBlueMatt/2024-01-crypto-module