Add UUID test file
Implement UUID term
Merge branch 'gchpaco_2063' into next