Merge branch 'feature/blocks-deny-refollow' into 'develop'