Merge branch 'master' into fipsv2. Using a merge instead of a rebase to retain commit IDs and tags.
--enable-enckeys
CryptKey
wc_CryptKey
user_settings.h