Merge "Fix project setup." into idea133