added custom uuid feature
Merge branch 'CL-2995932842487'