Merge "Fix project setup." into idea133 Auto-merge: e893163 * commit 'e8931637f9966ec84eb045bc67d15c7269e56f77': Fix project setup.