Merge pull request #6849 from annando/followup-6834