Issue #2349015 by caiovlp: Add proper UUID support
Merge branch 'Issue-2349015' into 7.x-1.x