Feature/tnuid

This was branched off feature/0.9.9.