Merge Frodo 12.3