Merge foreign_friendly project
Finish attaching foreign_friendly project