Squash commits from franco-c