Merge branch 'following-relationships-optimizations' into 'develop'