Merge "Secretkeeper: use Ed25519 identity key" into main