PR #6801

PR #6801 is not in the merge queue.