Merge with Frodo 12.1