PR #6809

PR #6809 is not in the merge queue.