Merge pull request #678 from microsoft/fix/null-alternate-key-to-v1

Merge pull request #678 from microsoft/fix/null-alternate-key-to-v1 #529