partial merge by hand with AuthenticationProtocol without touching AAAA stuff
mrg