Refactor some code related with the encoding of the Long ID to a short uri
Merge remote-tracking branch 'origin/master'