Merge pull request #9052 from annando/fix-change-owner