Add UUID test file
Implement UUID term
Merge branch 'gchpaco_2063' into next
Per @neumino, use st
Merge branch 'next' into sam_2156_upter