hack uniqueid
Merge origin/master