Dirty fix to allow table calls with uuid or name
Merge branch 'feature/uuid' into feature/cloud