Update from v1.2 gaia
Update test and manifest
Merge pull request #1 from AndreiH/update_project

Update from v1.2 gaia