Merge "Fix enabling team operations on project import"