Merge pull request #6535 from LevityNL/upstream-relationships