Merge branch 'master' into fipsv2. Using a merge instead of a rebase to retain commit IDs and tags.
HAVE_PK_CALLBACK