Quote some functions grants
Merge branch 'feature/uuid' into feature/cloud