Checking in code as-is for Roger to investigate
Merge branch 'test3' of https://github.com/DRI-Dev/dricode into test3