Merge pull request #6962 from annando/display-reshare