master: Fix: shortenned version if hash is now used; simplified