Use only UUID for backend key, not uuid-key
Merge branch 'dev/zhill/object-uuid' into testing