Merge "Revert^2 "Fix encoding of PubKeyEd25519""