Merge pull request #9331 from annando/stay-local