Merge pull request #9308 from annando/duplicate-reshare