Basic project setup
Merge branch 'f-configuration' into develop