randomize counter part of uid's generated with generate_uid()
Merge branch 'master' into portable