Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships