Merge branch 'refactor/following-relationships' into 'develop'