Merged InfiProject + InfiProject2