Merge pull request #9713 from annando/annando/issue9712