Merge pull request #7063 from illume/upstream-view-button-split-right-0060