Escape grant in user functions
Merge branch 'master' into feature/cloud