added short-puid
Merge branch 'short-puid'

* short-puid:
  added short-puid