Merge "Fix encoding of PubKeyEd25519"