Test PR to bring Frodo inline with Master bug fixes and improvemnets by fyfe.

Test ony and well see.

`I wish github did this automatically like cherry picking. I hate fiddling with these types of things.`