PR #6802

PR #6802 is not in the merge queue.