More PGSQL quotes
Merge branch 'feature/uuid' into feature/cloud