Merge remote-tracking branch 'public/ed25519_hup_v2'