Merge branch 'bugfix/block-follow-relationships' into 'develop'