Treat blank UUID values as nil
Merge branch 'lavrovdv-patch-1'