rebased PR1794 + fixes for Frodo