Merge pull request #7283 from annando/7280-fix