Merge pull request #7255 from annando/issue-7223