bugfix and added UUID capability, disabled by default
Authored by: nabber00 2014-01-05
Parent: [r827]
Child: [r829]