Task #119: Fix link on block
Merge branch 'master' into 119_1