EPG-33319 - progress on passing alternate endpoints / credentials.