Merge branch 'develop' into refactor/following-relationships