Reverts project back to active architectures
Merge branch 'fix/project-fixes' into develop

* fix/project-fixes:
  Reverts project back to active architectures