12.3 frodo pivos

Pull request for the-hydra 12.3 Frodo changes