Merge pull request #9083 from annando/persistent