Merge pull request #8445 from annando/issue-8371-again