Merge pull request #6648 from annando/issue-6603