14 Commits (FFMMM-patch-1)