Backport PR:2843 to private Frodo branch