2 Commits (fix_nomage_machine)