Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation