Fixes project settings
Merge branch 'fix/project-settings' into develop

* fix/project-settings:
  Fixes project settings