[GIT PULL] Asymmetric keys fix for v6.4-rc5