- fixed uniqueTid logic - patch by Edward-San.
Merge remote-tracking branch 'upstream/master'