Merge pull request #9992 from Harry-Ramsey/move-zeroize-memset-configuration

Move zeroize memset configuration